diff --git a/Duplicati/Library/Main/RSyncDir.cs b/Duplicati/Library/Main/RSyncDir.cs
index c34f8b712..02b697df8 100644
--- a/Duplicati/Library/Main/RSyncDir.cs
+++ b/Duplicati/Library/Main/RSyncDir.cs
@@ -1361,11 +1361,12 @@ namespace Duplicati.Library.Main.RSync
                 m_lastPartialFile = WritePossiblePartial(m_lastPartialFile, contentfile, signaturefile, volumesize);
             }
 
-            if (m_lastPartialFile != null)
-                return false;
 
             while (m_unproccesed.Files.Count > 0)
             {
+                if (m_lastPartialFile != null)
+                    return false;
+
                 if (totalSize >= volumesize)
                     break;
 
@@ -1560,7 +1561,7 @@ namespace Duplicati.Library.Main.RSync
                 }
             }
 
-            if (m_unproccesed.Files.Count == 0)
+            if (m_unproccesed.Files.Count == 0 && m_lastPartialFile != null)
                 return FinalizeMultiPass(signaturefile, contentfile, volumesize);
             else
                 return false;