diff --git a/ArduPlane/GCS_Mavlink.pde b/ArduPlane/GCS_Mavlink.pde
index 6c5a2036f7..e073828f50 100644
--- a/ArduPlane/GCS_Mavlink.pde
+++ b/ArduPlane/GCS_Mavlink.pde
@@ -636,6 +636,13 @@ bool GCS_MAVLINK::try_send_message(enum ap_message id)
         gcs[chan-MAVLINK_COMM_0].send_ahrs2(ahrs);
         break;
 
+    case MSG_MOUNT_STATUS:
+#if MOUNT == ENABLED
+        CHECK_PAYLOAD_SIZE(MOUNT_STATUS);    
+        camera_mount.status_msg(chan);
+#endif // MOUNT == ENABLED
+        break;
+
     case MSG_HWSTATUS:
         CHECK_PAYLOAD_SIZE(HWSTATUS);
         send_hwstatus(chan);
@@ -898,6 +905,7 @@ GCS_MAVLINK::data_stream_send(void)
         send_message(MSG_WIND);
         send_message(MSG_RANGEFINDER);
         send_message(MSG_SYSTEM_TIME);
+        send_message(MSG_MOUNT_STATUS);
 #if AP_TERRAIN_AVAILABLE
         send_message(MSG_TERRAIN);
 #endif
@@ -1490,12 +1498,6 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
         camera_mount.control_msg(msg);
         break;
     }
-
-    case MAVLINK_MSG_ID_MOUNT_STATUS:
-    {
-        camera_mount.status_msg(msg, chan);
-        break;
-    }
 #endif // MOUNT == ENABLED
 
     case MAVLINK_MSG_ID_RADIO: