diff --git a/src/ATBAPP/ATBDeviceControllerPlugin.cpp b/src/ATBAPP/ATBDeviceControllerPlugin.cpp
index 6ae0441..1126967 100644
--- a/src/ATBAPP/ATBDeviceControllerPlugin.cpp
+++ b/src/ATBAPP/ATBDeviceControllerPlugin.cpp
@@ -312,6 +312,12 @@ void ATBDeviceControllerPlugin::onChangedProgramModeToIDLE()
 
 void ATBDeviceControllerPlugin::onChangedProgramModeToOOO()
 {
+    // trigger diagRequest on SERVICE -> IDLE
+    if (this->currentProgramMode == PROGRAM_MODE::SERVICE) {
+        hw->dc_autoRequest(true);
+        this->diag->diagRequest();
+        hw->mdb_switchWake(1);
+    }
     this->currentProgramMode = PROGRAM_MODE::OOO;
 }