diff --git a/picard/file.py b/picard/file.py
index e0904da6c..3ec135792 100644
--- a/picard/file.py
+++ b/picard/file.py
@@ -461,12 +461,12 @@ class File(QtCore.QObject, Item):
                         self.state = File.CHANGED
                     break
         else:
-            self.similarity = 1.0
-            if self.state in (File.CHANGED, File.NORMAL):
-                self.state = File.NORMAL
-        # Set the file state to changed if the cover art changes
-        if self.metadata.images != self.orig_metadata.images and self.metadata.images:
-            self.state = File.CHANGED
+            if self.orig_metadata.images != self.metadata.images:
+                self.state = File.CHANGED
+            else:
+                self.similarity = 1.0
+                if self.state in (File.CHANGED, File.NORMAL):
+                    self.state = File.NORMAL
         if signal:
             log.debug("Updating file %r", self)
             if self.item: