diff --git a/common/src/main/java/bisq/common/ClockWatcher.java b/common/src/main/java/bisq/common/ClockWatcher.java
index 1b673535fa..36c54cbc0b 100644
--- a/common/src/main/java/bisq/common/ClockWatcher.java
+++ b/common/src/main/java/bisq/common/ClockWatcher.java
@@ -79,7 +79,7 @@ public class ClockWatcher {
         }
     }
 
-    public void stop() {
+    public void shutDown() {
         timer.stop();
         timer = null;
         counter = 0;
diff --git a/core/src/main/java/bisq/core/app/BisqExecutable.java b/core/src/main/java/bisq/core/app/BisqExecutable.java
index 9e14df37f9..0ab2895819 100644
--- a/core/src/main/java/bisq/core/app/BisqExecutable.java
+++ b/core/src/main/java/bisq/core/app/BisqExecutable.java
@@ -33,6 +33,7 @@ import bisq.core.trade.txproof.xmr.XmrTxProofService;
 
 import bisq.network.p2p.P2PService;
 
+import bisq.common.ClockWatcher;
 import bisq.common.UserThread;
 import bisq.common.app.AppModule;
 import bisq.common.config.BisqHelpFormatter;
@@ -228,6 +229,7 @@ public abstract class BisqExecutable implements GracefulShutDownHandler, BisqSet
         }
 
         try {
+            injector.getInstance(ClockWatcher.class).shutDown();
             injector.getInstance(OpenBsqSwapOfferService.class).shutDown();
             injector.getInstance(PriceFeedService.class).shutDown();
             injector.getInstance(ArbitratorManager.class).shutDown();