diff --git a/src/frsky.cpp b/src/frsky.cpp
index 13c56db7e..f069ce40e 100644
--- a/src/frsky.cpp
+++ b/src/frsky.cpp
@@ -143,7 +143,11 @@ inline void getGpsDistance()
   dist = frskyHubData.distFromEarthAxis * angle / 1000000;
   result += dist*dist;
 
-  dist = max(frskyHubData.baroAltitude_bp, frskyHubData.gpsAltitude_bp);
+  if (frskyHubData.baroAltitudeOffset)
+    dist = abs(frskyHubData.baroAltitude_bp);
+  else
+    dist = abs(frskyHubData.gpsAltitude_bp);
+
   result += dist*dist;
 
   frskyHubData.gpsDistance = isqrt32(result);