diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index 662b98b35c..e6de58563e 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -395,6 +395,11 @@ bool handle_command(struct vehicle_status_s *status, const struct safety_s *safe
 	enum VEHICLE_CMD_RESULT result = VEHICLE_CMD_RESULT_UNSUPPORTED;
 	bool ret = false;
 
+	/* only handle commands that are meant to be handled by this system and component */
+	if (cmd->target_system != status->system_id || cmd->target_component != status->component_id) {
+		return false;
+	}
+
 	/* only handle high-priority commands here */
 
 	/* request to set different system mode */