diff --git a/ArduCopter/ArduCopter.cpp b/ArduCopter/ArduCopter.cpp
index 9e28146c3b..31c46a63d1 100644
--- a/ArduCopter/ArduCopter.cpp
+++ b/ArduCopter/ArduCopter.cpp
@@ -284,8 +284,10 @@ void Copter::fast_loop()
     // check if we've landed or crashed
     update_land_and_crash_detectors();
 
+#if MOUNT == ENABLED
     // camera mount's fast update
     camera_mount.update_fast();
+#endif
 
     // log sensor health
     if (should_log(MASK_LOG_ANY)) {
diff --git a/ArduCopter/GCS_Mavlink.cpp b/ArduCopter/GCS_Mavlink.cpp
index b522de067f..1784d200f6 100644
--- a/ArduCopter/GCS_Mavlink.cpp
+++ b/ArduCopter/GCS_Mavlink.cpp
@@ -1058,7 +1058,9 @@ void GCS_MAVLINK::handleMessage(mavlink_message_t* msg)
 
     case MAVLINK_MSG_ID_PARAM_VALUE:
     {
+#if MOUNT == ENABLED
         copter.camera_mount.handle_param_value(msg);
+#endif
         break;
     }