diff --git a/src/libsync/discovery.cpp b/src/libsync/discovery.cpp
index 5bd2ed006c..7d2b4e5993 100644
--- a/src/libsync/discovery.cpp
+++ b/src/libsync/discovery.cpp
@@ -892,11 +892,12 @@ void ProcessDirectoryJob::processFileAnalyzeLocalInfo(
         }
 
         // The old file must have been deleted.
-        if (QFile::exists(_discoveryData->_localDir + base._path)
+        if (QFile::exists(_discoveryData->_localDir + originalPath)
             // Exception: If the rename changes case only (like "foo" -> "Foo") the
             // old filename might still point to the same file.
             && !(Utility::fsCasePreserving()
-                 && originalPath.compare(path._local, Qt::CaseInsensitive) == 0)) {
+                 && originalPath.compare(path._local, Qt::CaseInsensitive) == 0
+                 && originalPath != path._local)) {
             qCInfo(lcDisco) << "Not a move, base file still exists at" << originalPath;
             return false;
         }