diff --git a/flix/mavlink.ino b/flix/mavlink.ino
index 56974fa..5418701 100644
--- a/flix/mavlink.ino
+++ b/flix/mavlink.ino
@@ -21,7 +21,7 @@ void sendMavlink()
 		lastSlow = t;
 
 		mavlink_msg_heartbeat_pack(SYSTEM_ID, MAV_COMP_ID_AUTOPILOT1, &msg, MAV_TYPE_QUADROTOR,
-			MAV_AUTOPILOT_GENERIC, MAV_MODE_FLAG_MANUAL_INPUT_ENABLED | MAV_MODE_FLAG_SAFETY_ARMED,
+			MAV_AUTOPILOT_GENERIC, MAV_MODE_FLAG_MANUAL_INPUT_ENABLED | armed ? MAV_MODE_FLAG_SAFETY_ARMED : 0,
 			0, MAV_STATE_STANDBY);
 		sendMessage(&msg);
 	}