diff --git a/src/Functions/greatCircleDistance.cpp b/src/Functions/greatCircleDistance.cpp
index bff92d7738d..5707326c60a 100644
--- a/src/Functions/greatCircleDistance.cpp
+++ b/src/Functions/greatCircleDistance.cpp
@@ -102,8 +102,6 @@ void geodistInit()
 inline float geodistDegDiff(float f)
 {
     f = fabsf(f);
-    while (f > 360)
-        f -= 360;
     if (f > 180)
         f = 360 - f;
     return f;
diff --git a/src/Interpreters/InterpreterCreateQuery.h b/src/Interpreters/InterpreterCreateQuery.h
index cf27f68ad73..30f18aa4134 100644
--- a/src/Interpreters/InterpreterCreateQuery.h
+++ b/src/Interpreters/InterpreterCreateQuery.h
@@ -45,7 +45,8 @@ public:
         internal = internal_;
     }
 
-    /// Obtain information about columns, their types, default values and column comments, for case when columns in CREATE query is specified explicitly.
+    /// Obtain information about columns, their types, default values and column comments,
+    ///  for case when columns in CREATE query is specified explicitly.
     static ColumnsDescription getColumnsDescription(const ASTExpressionList & columns, const Context & context, bool sanity_check_compression_codecs);
     static ConstraintsDescription getConstraintsDescription(const ASTExpressionList * constraints);
 
diff --git a/tests/queries/0_stateless/01359_geodistance_loop.reference b/tests/queries/0_stateless/01359_geodistance_loop.reference
new file mode 100644
index 00000000000..8484d062f57
--- /dev/null
+++ b/tests/queries/0_stateless/01359_geodistance_loop.reference
@@ -0,0 +1 @@
+inf
diff --git a/tests/queries/0_stateless/01359_geodistance_loop.sql b/tests/queries/0_stateless/01359_geodistance_loop.sql
new file mode 100644
index 00000000000..4c555a2538e
--- /dev/null
+++ b/tests/queries/0_stateless/01359_geodistance_loop.sql
@@ -0,0 +1 @@
+SELECT geoDistance(0., 0., -inf, 1.);