diff --git a/src/ATBAPP/DeviceControllerDiag.cpp b/src/ATBAPP/DeviceControllerDiag.cpp
index eab069e..ad06444 100644
--- a/src/ATBAPP/DeviceControllerDiag.cpp
+++ b/src/ATBAPP/DeviceControllerDiag.cpp
@@ -406,7 +406,10 @@ void DeviceControllerDiag::sub_componentAssessment()
     }
 
     if (flag_sendOperate) {
-        this->private_setDiagEvent(DeviceController::State::O000);
+        // O000 must not be part of event set
+        DCMachineEvent O000DCMachineEvent = DCMachineEvent(DeviceController::State::O000,
+                                                           QUuid::createUuid().toString(QUuid::WithoutBraces).mid(0, 8));
+        this->private_sendDiagEvent(O000DCMachineEvent, DeviceController::Action::SET);
     }