diff --git a/internal/photoprism/mediafile.go b/internal/photoprism/mediafile.go
index 6564b48b0..81259ade6 100644
--- a/internal/photoprism/mediafile.go
+++ b/internal/photoprism/mediafile.go
@@ -447,9 +447,13 @@ func (m *MediaFile) Move(newFilename string) error {
 		return err
 	}
 
+	if err := os.Remove(m.filename); err != nil {
+		return err
+	}
+
 	m.filename = newFilename
 
-	return os.Remove(m.filename)
+	return nil
 }
 
 // Copy a mediafile to another file by destinationFilename.