diff --git a/src/core/geodesy/geodetic.cpp b/src/core/geodesy/geodetic.cpp
index 1099e965c7..b4fc88822f 100644
--- a/src/core/geodesy/geodetic.cpp
+++ b/src/core/geodesy/geodetic.cpp
@@ -25,6 +25,8 @@
 #include <lin_alg.h>
 #include <math_funcs.h>
 
+#include <cmath>
+
 using Math::pow2;
 
 inline constexpr Numeric DEG2RAD = Conversion::deg2rad(1);
@@ -45,6 +47,21 @@ inline constexpr Numeric ellipsoid_radii_threshold = 1e-3;
 inline constexpr Numeric POLELATZZZ =
     90 - 1e-8;  // Rename to POLELAT when other one removed
 
+/** Threshold for near-pole detection in ECEF to geodetic conversion
+
+    When the horizontal distance from the z-axis (sqrt(x^2 + y^2)) is
+    smaller than this threshold times the semi-major axis, the point
+    is treated as being on the pole to avoid numerical instability.
+*/
+inline constexpr Numeric near_pole_threshold_ecef = 1e-15;
+
+/** Maximum iterations for ECEF to geodetic conversion
+
+     Prevents infinite loops in edge cases where the iterative
+     algorithm fails to converge.
+*/
+inline constexpr Index max_ecef2geodetic_iter = 100;
+
 /*===========================================================================
   === The functions, in alphabetical order
   ===========================================================================*/
@@ -117,29 +134,39 @@ Vector3 ecef2geodetic(Vector3 ecef, Vector2 refellipsoid) {
     pos     = ecef2geocentric(ecef);
     pos[0] -= refellipsoid[0];
 
+  } else {
     // The general algorithm not stable for lat=+-90. Catch these cases
-  } else if (ecef[0] == 0 && ecef[1] == 0) {
-    pos[0] = fabs(ecef[2]) - refellipsoid[1];
-    pos[1] = ecef[2] >= 0 ? 90 : -90;
-    pos[2] = 0;
+    // Also catch near-pole cases where numerical instability can occur
+    const Numeric sq = std::hypot(ecef[0], ecef[1]);
 
-    // General algorithm
-  } else {
-    pos[2] = RAD2DEG * atan2(ecef[1], ecef[0]);
-
-    const Numeric sq = sqrt(ecef[0] * ecef[0] + ecef[1] * ecef[1]);
-    Numeric B0       = atan2(ecef[2], sq);
-    Numeric B        = B0 - 1, N;
-    const Numeric e2 = 1 - (refellipsoid[1] * refellipsoid[1]) /
-                               (refellipsoid[0] * refellipsoid[0]);
-    // 1e-15 seems to give a accuracy of better than 2 cm
-    while (fabs(B - B0) > 1e-15) {
-      N      = refellipsoid[0] / sqrt(1 - e2 * sin(B0) * sin(B0));
-      pos[0] = sq / cos(B0) - N;
-      B      = B0;
-      B0     = atan((ecef[2] / sq) * 1 / (1 - e2 * N / (N + pos[0])));
+    if (sq < near_pole_threshold_ecef * refellipsoid[0]) {
+      // Near-pole case: use simplified formula (same as exact pole)
+      pos[0] = fabs(ecef[2]) - refellipsoid[1];
+      pos[1] = ecef[2] >= 0 ? 90 : -90;
+      pos[2] = RAD2DEG * atan2(ecef[1], ecef[0]);
+
+    } else {
+      // General algorithm
+      pos[2] = RAD2DEG * atan2(ecef[1], ecef[0]);
+
+      Numeric B0       = atan2(ecef[2], sq);
+      Numeric B        = B0 - 1, N;
+      const Numeric e2 = 1 - (refellipsoid[1] * refellipsoid[1]) /
+                                 (refellipsoid[0] * refellipsoid[0]);
+      Index num_iter = 0;
+      // 1e-15 seems to give a accuracy of better than 2 cm
+      while (fabs(B - B0) > 1e-15 && num_iter < max_ecef2geodetic_iter) {
+        N      = refellipsoid[0] / sqrt(1 - e2 * sin(B0) * sin(B0));
+        pos[0] = sq / cos(B0) - N;
+        B      = B0;
+        B0     = atan((ecef[2] / sq) * 1 / (1 - e2 * N / (N + pos[0])));
+        ++num_iter;
+      }
+      ARTS_USER_ERROR_IF(num_iter == max_ecef2geodetic_iter,
+                         "ECEF to geodetic conversion did not converge. "
+                         "Input may be too close to singular values.");
+      pos[1] = RAD2DEG * B;
     }
-    pos[1] = RAD2DEG * B;
   }
 
   return pos;
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 7c3a86da3c..6e92ad0b6b 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -178,8 +178,8 @@ target_link_libraries(test_rtepack PUBLIC artstime rtepack rng)
 # ####
 add_executable(test_path_point test_path_point.cc)
 target_link_libraries(test_path_point PUBLIC artstime path rng)
-#add_test(NAME "cpp.fast.test_path_point" COMMAND test_path_point)
-#add_dependencies(check-deps test_path_point)
+add_test(NAME "cpp.fast.test_path_point" COMMAND test_path_point)
+add_dependencies(check-deps test_path_point)
 
 # ####
 add_executable(test_fwd test_fwd.cc)