diff --git a/ArduCopter/ArduCopter.pde b/ArduCopter/ArduCopter.pde
index a8b465e325..a2ef084800 100644
--- a/ArduCopter/ArduCopter.pde
+++ b/ArduCopter/ArduCopter.pde
@@ -1374,7 +1374,9 @@ static void update_GPS(void)
         }
 
 #if CAMERA == ENABLED
-        camera.update_location(current_loc);
+        if (camera.update_location(current_loc) == true) {
+            do_take_picture();
+        }
 #endif                
     }