diff --git a/src/ATBAPP/DeviceControllerDiag.cpp b/src/ATBAPP/DeviceControllerDiag.cpp
index 7de2550..ee56198 100644
--- a/src/ATBAPP/DeviceControllerDiag.cpp
+++ b/src/ATBAPP/DeviceControllerDiag.cpp
@@ -98,6 +98,9 @@ bool DeviceControllerDiag::isOperatingState()
 
 QSet<DCMachineEvent> DeviceControllerDiag::getCurrentMachineState()
 {
+    // ensure that currentMachineEventSet is delivered here
+    if (this->isRequestRunning) return this->previousMachineEventSet;
+
     return this->machineEventSet;
 }