diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
index e21abda92ffe25d52fb5270f5116b6a650cda2ba..165bebd65a3cc0cf6a9724536b07ca01f89ad3af 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMover.java
@@ -89,7 +89,8 @@ public final class DataMover
 
     private static final String[] PROCESS_MARKER_FILENAMES =
                 { INCOMING_PROCESS_MARKER_FILENAME, OUTGOING_PROCESS_MARKER_FILENAME,
-                        LOCAL_PROCESS_MARKER_FILENAME, RECOVERY_PROCESS_MARKER_FILENAME };
+                        LOCAL_PROCESS_MARKER_FILENAME, RECOVERY_PROCESS_MARKER_FILENAME,
+                        SHUTDOWN_PROCESS_MARKER_FILENAME };
 
     private static final Logger operationLog =
             LogFactory.getLogger(LogCategory.OPERATION, DataMover.class);
diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java
index 9678232d7141d71e80e32dbb9a5d8a2c1e492809..83e7749e17c8f2bea995d200d3fa3cccc9279085 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/DataMoverShutdownHook.java
@@ -102,7 +102,8 @@ final class DataMoverShutdownHook implements ITriggerable
         terminable.terminate();
         deleteFile(outgoingTargetLocationFile, "outgoing target location");
         deleteFile(markerFile, "marker");
-        deleteFile(new File(DATAMOVER_PID_FILE_NAME), "Datamover pid file");
+        deleteFile(new File(DATAMOVER_PID_FILE_NAME), "Datamover pid");
+        deleteFile(new File(DataMover.SHUTDOWN_MARKER_FILENAME), "shutdown triggering");
         exitHandler.exit(0);
     }
 }
\ No newline at end of file