diff --git a/couchpotato/core/plugins/renamer.py b/couchpotato/core/plugins/renamer.py
index 4163383..f02cb73 100755
--- a/couchpotato/core/plugins/renamer.py
+++ b/couchpotato/core/plugins/renamer.py
@@ -741,8 +741,8 @@ Remove it if you want it to be renamed (again, or at least let it try again)
 
         for filename in tag_files:
 
-            # Don't tag .ignore files
-            if os.path.splitext(filename)[1] == '.ignore':
+            # Don't tag .ignore files or when renamer is set to cleanup
+            if os.path.splitext(filename)[1] == '.ignore' or self.conf('cleanup'):
                 continue
 
             tag_filename = '%s.%s.ignore' % (os.path.splitext(filename)[0], tag)