diff --git a/couchpotato/core/plugins/renamer/main.py b/couchpotato/core/plugins/renamer/main.py
index 059ce6ad..98c7b102 100644
--- a/couchpotato/core/plugins/renamer/main.py
+++ b/couchpotato/core/plugins/renamer/main.py
@@ -182,8 +182,9 @@ class Renamer(Plugin):
 
                         # Do rename others
                         else:
-                            if self.conf('move_leftover') and file_type is 'leftover':
-                                rename_files[current_file] = os.path.join(destination, final_folder_name, os.path.basename(current_file))
+                            if file_type is 'leftover':
+                                if self.conf('move_leftover'):
+                                    rename_files[current_file] = os.path.join(destination, final_folder_name, os.path.basename(current_file))
                             else:
                                 rename_files[current_file] = os.path.join(destination, final_folder_name, final_file_name)