diff --git a/src/ebusd/main.cpp b/src/ebusd/main.cpp
index afcd37e1..0b2ad941 100644
--- a/src/ebusd/main.cpp
+++ b/src/ebusd/main.cpp
@@ -669,11 +669,11 @@ void signalHandler(int sig) {
     break;
   case SIGINT:
     logNotice(lf_main, "SIGINT received");
-    s_mainLoop->join();
+    s_mainLoop->shutdown();
     break;
   case SIGTERM:
     logNotice(lf_main, "SIGTERM received");
-    s_mainLoop->join();
+    s_mainLoop->shutdown();
     break;
   default:
     logNotice(lf_main, "undefined signal %s", strsignal(sig));