diff --git a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
index 99b7496c..00d6c451 100644
--- a/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
+++ b/src/fsfw/devicehandlers/DeviceHandlerBase.cpp
@@ -567,7 +567,7 @@ void DeviceHandlerBase::setMode(Mode_t newMode, uint8_t newSubmode) {
     continueToNormal = false;
     // TODO: Check whether the following two lines are okay to do so.
     transitionSourceMode = MODE_ON;
-    transitionSourceSubMode = submode;
+    transitionSourceSubMode = newSubmode;
     mode = _MODE_TO_NORMAL;
     return;
   }