diff --git a/thermal/Heater.cpp b/thermal/Heater.cpp
index 782ce2963..d148c871f 100644
--- a/thermal/Heater.cpp
+++ b/thermal/Heater.cpp
@@ -286,7 +286,10 @@ void Heater::handleQueue() {
 		if (result == HasReturnvaluesIF::RETURN_OK) {
 			return;
 		}
-		parameterHelper.handleParameterMessage(&command);
+		result = parameterHelper.handleParameterMessage(&command);
+        if (result == HasReturnvaluesIF::RETURN_OK) {
+            return;
+        }
 	}
 }