diff --git a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
index 63124dc8..31cbf3b2 100644
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
@@ -862,7 +862,8 @@ void DeviceHandlerBase::handleReply(const uint8_t* receivedData, DeviceCommandId
     /* Other completion failure messages are created by timeout.
     Powering down the device might take some time during which periodic
     replies may still come in. */
-    if (mode != _MODE_WAIT_OFF) {
+    if (mode != _MODE_WAIT_OFF and mode != _MODE_SHUT_DOWN and mode != _MODE_POWER_DOWN and
+        mode != _MODE_SWITCH_IS_OFF) {
       triggerEvent(DEVICE_UNREQUESTED_REPLY, foundId);
     }
   }