diff --git a/src/modelec_com/src/pcb_action_interface.cpp b/src/modelec_com/src/pcb_action_interface.cpp
index d09a67b..f42ae8b 100644
--- a/src/modelec_com/src/pcb_action_interface.cpp
+++ b/src/modelec_com/src/pcb_action_interface.cpp
@@ -427,32 +427,32 @@ namespace Modelec
                     relay_move_res_pub_->publish(relay_msg);
                 }
             }
-            else if (tokens[0] == "EVENT")
-            {
-                if (tokens[1] == "TIR")
-                {
-                    if (tokens[2] == "START")
-                    {
-                        tir_start_pub_->publish(std_msgs::msg::Empty());
-                        RespondEvent(tokens[1], {tokens[2]});
-                    }
-                    else if (tokens[2] == "ARM")
-                    {
-                        tir_arm_pub_->publish(std_msgs::msg::Empty());
-                        RespondEvent(tokens[1], {tokens[2]});
-                    }
-                    else if (tokens[2] == "DIS")
-                    {
-                        tir_disarm_pub_->publish(std_msgs::msg::Empty());
-                        RespondEvent(tokens[1], {tokens[2]});
-                    }
-                }
-            }
             else
             {
                 RCLCPP_WARN(this->get_logger(), "Unknown message format: '%s'", msg->data.c_str());
             }
         }
+        else if (tokens[0] == "EVENT")
+        {
+            if (tokens[1] == "TIR")
+            {
+                if (tokens[2] == "START")
+                {
+                    tir_start_pub_->publish(std_msgs::msg::Empty());
+                    RespondEvent(tokens[1], {tokens[2]});
+                }
+                else if (tokens[2] == "ARM")
+                {
+                    tir_arm_pub_->publish(std_msgs::msg::Empty());
+                    RespondEvent(tokens[1], {tokens[2]});
+                }
+                else if (tokens[2] == "DIS")
+                {
+                    tir_disarm_pub_->publish(std_msgs::msg::Empty());
+                    RespondEvent(tokens[1], {tokens[2]});
+                }
+            }
+        }
     }
 
     void PCBActionInterface::SendToPCB(const std::string& data) const