diff --git a/couchpotato/core/plugins/scanner/main.py b/couchpotato/core/plugins/scanner/main.py
index 6528af7..a25a31c 100644
--- a/couchpotato/core/plugins/scanner/main.py
+++ b/couchpotato/core/plugins/scanner/main.py
@@ -237,9 +237,9 @@ class Scanner(Plugin):
                 del path_identifiers[identifier]
         del delete_identifiers
 
-        # Determine file types
-        processed_movies = {}
-        total_found = len(movie_files)
+
+        # Make sure we remove older / still extracting files
+        valid_files = {}
         while True and not self.shuttingDown():
             try:
                 identifier, group = movie_files.popitem()
@@ -294,6 +294,19 @@ class Scanner(Plugin):
 
                     continue
 
+            valid_files[identifier] = group
+
+        del movie_files
+
+        # Determine file types
+        processed_movies = {}
+        total_found = len(valid_files)
+        while True and not self.shuttingDown():
+            try:
+                identifier, group = valid_files.popitem()
+            except:
+                break
+
             # Group extra (and easy) files first
             # images = self.getImages(group['unsorted_files'])
             group['files'] = {