diff --git a/src/modules/mavlink/mavlink_main.cpp b/src/modules/mavlink/mavlink_main.cpp
index 86ea3247eb..577f8acd8c 100644
--- a/src/modules/mavlink/mavlink_main.cpp
+++ b/src/modules/mavlink/mavlink_main.cpp
@@ -2236,11 +2236,11 @@ Mavlink::task_main(int argc, char *argv[])
 				msg.target_component = command_ack.target_component;
 				current_command_ack = command_ack.command;
 
-				// always transmit the acknowledge
-				bool _transmitting_enabled_temp = _transmitting_enabled;
-				_transmitting_enabled = true;
+				// TODO: always transmit the acknowledge once it is only sent over the instance the command is received
+				//bool _transmitting_enabled_temp = _transmitting_enabled;
+				//_transmitting_enabled = true;
 				mavlink_msg_command_ack_send_struct(get_channel(), &msg);
-				_transmitting_enabled = _transmitting_enabled_temp;
+				//_transmitting_enabled = _transmitting_enabled_temp;
 			}
 		}