diff --git a/libraries/AP_Baro/AP_Baro.cpp b/libraries/AP_Baro/AP_Baro.cpp
index ebb4af1396..d9d9736c3f 100644
--- a/libraries/AP_Baro/AP_Baro.cpp
+++ b/libraries/AP_Baro/AP_Baro.cpp
@@ -1013,7 +1013,9 @@ void AP_Baro::update_field_elevation(void)
             is_zero(_field_elevation)) {
             // auto-set based on origin
             Location origin;
-            if (!armed && AP::ahrs().get_origin(origin)) {
+            if (!armed &&
+                AP::ahrs().get_origin(origin) &&
+                origin.alt != 0) {
                 _field_elevation_active = origin.alt * 0.01;
                 new_field_elev = true;
             }