diff --git a/src/modules/commander/commander.cpp b/src/modules/commander/commander.cpp
index 27d5e42608..662b98b35c 100644
--- a/src/modules/commander/commander.cpp
+++ b/src/modules/commander/commander.cpp
@@ -587,15 +587,15 @@ bool handle_command(struct vehicle_status_s *status, const struct safety_s *safe
 		break;
 
 	default:
-		/* warn about unsupported commands */
+		/* Warn about unsupported commands, this makes sense because only commands
+		 * to this component ID (or all) are passed by mavlink. */
 		answer_command(*cmd, VEHICLE_CMD_RESULT_UNSUPPORTED);
 		break;
 	}
-	/* silently ignore unsupported commands, maybe they are passed on over mavlink */
-//	if (result != VEHICLE_CMD_RESULT_UNSUPPORTED) {
-//		/* already warned about unsupported commands in "default" case */
-//		answer_command(*cmd, result);
-//	}
+	if (result != VEHICLE_CMD_RESULT_UNSUPPORTED) {
+		/* already warned about unsupported commands in "default" case */
+		answer_command(*cmd, result);
+	}
 
 	/* send any requested ACKs */
 	if (cmd->confirmation > 0 && result != VEHICLE_CMD_RESULT_UNSUPPORTED) {