diff --git a/ArduCopter/control_auto.pde b/ArduCopter/control_auto.pde
index 4fa80988ca..b28d06df67 100644
--- a/ArduCopter/control_auto.pde
+++ b/ArduCopter/control_auto.pde
@@ -362,6 +362,10 @@ uint8_t get_default_auto_yaw_mode(bool rtl)
 {
     switch (g.wp_yaw_behavior) {
 
+        case WP_YAW_BEHAVIOR_NONE:
+            return AUTO_YAW_HOLD;
+            break;
+
         case WP_YAW_BEHAVIOR_LOOK_AT_NEXT_WP_EXCEPT_RTL:
             if (rtl) {
                 return AUTO_YAW_HOLD;