diff --git a/tasks/Task.cpp b/tasks/Task.cpp
index 70cc056..9814014 100644
--- a/tasks/Task.cpp
+++ b/tasks/Task.cpp
@@ -161,7 +161,9 @@ void Task::publishFault()
 }
 void Task::updateHook()
 {
-    while (_cmd_in.read(m_cmd_in) == RTT::NewData) {
+    TaskBase::updateHook();
+
+    if (_cmd_in.read(m_cmd_in) == RTT::NewData) {
         if (m_cmd_in.elements.size() != 1) {
             return exception(INVALID_COMMAND_SIZE);
         }
@@ -185,8 +187,6 @@ void Task::updateHook()
 
     auto state = readAndPublishControllerStates();
     evaluateInverterStatus(state.inverter_status);
-
-    TaskBase::updateHook();
 }
 void Task::processIO()
 {