diff --git a/ArduCopter/motors.pde b/ArduCopter/motors.pde
index dbea05b799..2ec569a5c6 100644
--- a/ArduCopter/motors.pde
+++ b/ArduCopter/motors.pde
@@ -293,7 +293,7 @@ static void pre_arm_checks(bool display_failure)
 
 #if AC_FENCE == ENABLED
     // check fence is initialised
-    if(!fence.pre_arm_check() || (fence.enabled() && g_gps->hdop > g.gps_hdop_good)) {
+    if(!fence.pre_arm_check() || (((fence.get_enabled_fences() & AC_FENCE_TYPE_CIRCLE) != 0) && g_gps->hdop > g.gps_hdop_good)) {
         if (display_failure) {
             gcs_send_text_P(SEVERITY_HIGH,PSTR("PreArm: Bad GPS Pos"));
         }