diff --git a/fairmq/FairMQDevice.cxx b/fairmq/FairMQDevice.cxx
index 127edfcf..025d81cf 100644
--- a/fairmq/FairMQDevice.cxx
+++ b/fairmq/FairMQDevice.cxx
@@ -90,18 +90,19 @@ void FairMQDevice::SignalHandler(int signal)
     fTerminateStateThread.join();
 
     stop();
-    fRunning = false;
-    if (!fTerminated)
-    {
-        fTerminated = true;
-        LOG(INFO) << "Exiting.";
-    }
-    else
-    {
-        LOG(WARN) << "Repeated termination or bad initialization? Aborting.";
-        // std::abort();
-        exit(EXIT_FAILURE);
-    }
+    exit(EXIT_FAILURE);
+    // fRunning = false;
+    // if (!fTerminated)
+    // {
+    //     fTerminated = true;
+    //     LOG(INFO) << "Exiting.";
+    // }
+    // else
+    // {
+    //     LOG(WARN) << "Repeated termination or bad initialization? Aborting.";
+    //     // std::abort();
+    //     exit(EXIT_FAILURE);
+    // }
 }
 
 void FairMQDevice::ConnectChannels(list<FairMQChannel*>& chans)
diff --git a/fairmq/tools/runSimpleMQStateMachine.h b/fairmq/tools/runSimpleMQStateMachine.h
index e3fe8a26..b160e3d9 100644
--- a/fairmq/tools/runSimpleMQStateMachine.h
+++ b/fairmq/tools/runSimpleMQStateMachine.h
@@ -46,7 +46,6 @@ inline int runStateMachine(TMQDevice& device, FairMQProgOptions& config)
     }
     else if (control == "static")
     {
-        device.ChangeState(TMQDevice::RUN);
         device.WaitForEndOfState(TMQDevice::RUN);
 
         device.ChangeState(TMQDevice::RESET_TASK);