diff --git a/common/src/main/java/bisq/common/setup/CommonSetup.java b/common/src/main/java/bisq/common/setup/CommonSetup.java
index df3280aae7..f2fac170fc 100644
--- a/common/src/main/java/bisq/common/setup/CommonSetup.java
+++ b/common/src/main/java/bisq/common/setup/CommonSetup.java
@@ -102,13 +102,13 @@ public class CommonSetup {
 
     protected static void setupSigIntHandlers(GracefulShutDownHandler gracefulShutDownHandler) {
         Signal.handle(new Signal("INT"), signal -> {
-            gracefulShutDownHandler.gracefulShutDown(() -> {
-            });
+            UserThread.execute(() -> gracefulShutDownHandler.gracefulShutDown(() -> {
+            }));
         });
 
         Signal.handle(new Signal("TERM"), signal -> {
-            gracefulShutDownHandler.gracefulShutDown(() -> {
-            });
+            UserThread.execute(() -> gracefulShutDownHandler.gracefulShutDown(() -> {
+            }));
         });
     }