diff --git a/src/Application.cpp b/src/Application.cpp
index 38efee3a..597c58b1 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -227,7 +227,9 @@ void Application::shutdown() {
     this->stopDebugServer();
     this->stopTargetController();
 
-    if (this->signalHandler.getThreadState() != ThreadState::STOPPED) {
+    if (this->signalHandler.getThreadState() != ThreadState::STOPPED
+        && this->signalHandler.getThreadState() != ThreadState::UNINITIALISED
+    ) {
         // Signal handler is still running
         this->signalHandler.triggerShutdown();