diff --git a/datamover/source/java/ch/systemsx/cisd/datamover/Main.java b/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
index b19f412d653314aaff8cf72972146d18565bac89..215dc6861ddb57133950a5815900f0384917b0de 100644
--- a/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
+++ b/datamover/source/java/ch/systemsx/cisd/datamover/Main.java
@@ -69,7 +69,6 @@ public class Main
     {
         LogInitializer.init();
         Thread.setDefaultUncaughtExceptionHandler(loggingExceptionHandler);
-        Runtime.getRuntime().addShutdownHook(new Thread(loggingShutdownHook, "Shutdown Hook"));
     }
 
     private static void printInitialLogMessage(final Parameters parameters)
@@ -83,6 +82,7 @@ public class Main
             operationLog.info(line);
         }
         parameters.log();
+        Runtime.getRuntime().addShutdownHook(new Thread(loggingShutdownHook, "Shutdown Hook"));
     }
 
     /**