diff --git a/ArduPlane/geofence.pde b/ArduPlane/geofence.pde
index 7e9d4e7e34..e7bc0e8c63 100644
--- a/ArduPlane/geofence.pde
+++ b/ArduPlane/geofence.pde
@@ -89,8 +89,9 @@ static void geofence_load(void)
         }
     }
 
-    if (g.fence_total < 0) {
+    if (g.fence_total <= 0) {
         g.fence_total.set(0);
+        return;
     }
 
     for (i=0; i<g.fence_total; i++) {
@@ -125,6 +126,7 @@ failed:
 static bool geofence_enabled(void)
 {
     if (g.fence_action == FENCE_ACTION_NONE ||
+        g.fence_total < 5 ||
         (g.fence_action != FENCE_ACTION_REPORT &&
          (g.fence_channel == 0 ||
           APM_RC.InputCh(g.fence_channel-1) < FENCE_ENABLE_PWM))) {