diff --git a/scanner/scanner/__init__.py b/scanner/scanner/__init__.py
index 6e3a7dd2..587f1086 100644
--- a/scanner/scanner/__init__.py
+++ b/scanner/scanner/__init__.py
@@ -1,4 +1,5 @@
 async def main():
+	import asyncio
 	import os
 	import logging
 	import sys
@@ -38,8 +39,9 @@ async def main():
 	) as client:
 		try:
 			scanner = Scanner(client, languages=languages.split(","), api_key=api_key)
-			await scanner.scan(path)
-			logging.info("Scan finished. Starting to monitor...")
-			await monitor(path, scanner)
+			await asyncio.gather(
+				monitor(path, scanner),
+				scanner.scan(path),
+			)
 		except ProviderError as e:
 			logging.error(e)
diff --git a/scanner/scanner/scanner.py b/scanner/scanner/scanner.py
index 337da487..e0784a77 100644
--- a/scanner/scanner/scanner.py
+++ b/scanner/scanner/scanner.py
@@ -54,6 +54,7 @@ class Scanner:
 		# We batch videos by 20 because too mutch at once kinda DDOS everything.
 		for group in batch(iter(videos), 20):
 			await asyncio.gather(*map(self.identify, group))
+		logging.info("Scan finished.")
 
 	async def get_registered_paths(self) -> List[str]:
 		paths = None