diff --git a/.gitmodules b/.gitmodules
index ed4a9cdabed..75338652f01 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -233,4 +233,5 @@
 	url = https://github.com/azadkuh/sqlite-amalgamation
 [submodule "contrib/s2geometry"]
 	path = contrib/s2geometry
-	url = https://github.com/Andr0901/s2geometry
+	url = https://github.com/ClickHouse-Extras/s2geometry.git
+	branch = master
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 52004208474..2b6629d0817 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -332,4 +332,6 @@ if (USE_SQLITE)
     add_subdirectory(sqlite-cmake)
 endif()
 
-add_subdirectory(s2geometry-cmake)
+if (USE_S2_GEOMETRY)
+    add_subdirectory(s2geometry-cmake)
+endif()