diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/MonitorStarter.java b/datamover/source/java/ch/systemsx/cisd/datamover/MonitorStarter.java
index 50d3c9f0f8c44f02de7ca9b436614be72589b702..a442efe3cb53c5209a229b67ea1d114d9e27ce84 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/MonitorStarter.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/MonitorStarter.java
@@ -137,8 +137,11 @@ public class MonitorStarter
     private void recoverIncomingAfterShutdown(FileStore incomingStore, IReadPathOperations incomingReadOperations,
             boolean isIncomingRemote, LazyPathHandler localProcessor)
     {
-        recoverIncomingInProgress(incomingStore, incomingReadOperations, bufferDirs.getCopyInProgressDir(), bufferDirs
-                .getCopyCompleteDir(), parameters.getPrefixForIncoming());
+        if (isIncomingRemote)
+        {
+            recoverIncomingInProgress(incomingStore, incomingReadOperations, bufferDirs.getCopyInProgressDir(),
+                    bufferDirs.getCopyCompleteDir(), parameters.getPrefixForIncoming());
+        }
         recoverIncomingCopyComplete(bufferDirs.getCopyCompleteDir(), localProcessor);
     }