diff --git a/src/ATBAPP/DeviceControllerDiag.cpp b/src/ATBAPP/DeviceControllerDiag.cpp
index 81c0631..7cb6021 100644
--- a/src/ATBAPP/DeviceControllerDiag.cpp
+++ b/src/ATBAPP/DeviceControllerDiag.cpp
@@ -301,6 +301,13 @@ void DeviceControllerDiag::sub_componentAssessment()
     if (flag_sendOperate) {
         this->private_sendDiagEvent(DeviceController::State::O000);
     }
+
+
+    // finish diag
+
+    this->diagRequestTimeoutTimer->stop();
+    this->isRequestRunning  = false;
+    this->flagInterruptDiag = false;
 }
 
 
@@ -315,10 +322,6 @@ void DeviceControllerDiag::sub_componentAssessment()
  */
 void DeviceControllerDiag::private_sendDiagEvent(DeviceController::State result)
 {
-    this->diagRequestTimeoutTimer->stop();
-    this->isRequestRunning  = false;
-    this->flagInterruptDiag = false;
-
     qCritical() << "DeviceControllerDiag::private_sendDiagEvent() result: " << result;