diff --git a/Modules/StateViewer/StateViewer.cpp b/Modules/StateViewer/StateViewer.cpp
index 735b48808204a533a4dc0393168afabcbb888e47..aa263af50758c889e32f5b074b309e73b78fbf2c 100644
--- a/Modules/StateViewer/StateViewer.cpp
+++ b/Modules/StateViewer/StateViewer.cpp
@@ -109,11 +109,9 @@ void StateViewerModule::onMsgReceived(const ModuleMessage& msg)
         int index  = StatesList::statesIndexes[currentState];
         auto label = outerLayout->itemAt(index)->widget();
 
-        if (currentState == StatesList::State::INIT)
-            label->setStyleSheet(currentStateStyle);
-        else if (currentState == StatesList::State::INIT_ERROR)
+        if (currentState == StatesList::State::INIT_ERROR)
             label->setStyleSheet(errorStyle);
-        else if (currentState > StatesList::State::INIT_ERROR)
+        else
             label->setStyleSheet(currentStateStyle);
 
         // Set as completed every state before the current