diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c8ccb6e17c..d37cdfc3af8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -352,6 +352,7 @@ include (cmake/find/simdjson.cmake)
 include (cmake/find/rapidjson.cmake)
 include (cmake/find/fastops.cmake)
 include (cmake/find/orc.cmake)
+include (cmake/find/replxx.cmake)
 
 find_contrib_lib(cityhash)
 find_contrib_lib(farmhash)
diff --git a/cmake/find/replxx.cmake b/cmake/find/replxx.cmake
new file mode 100644
index 00000000000..13df104515e
--- /dev/null
+++ b/cmake/find/replxx.cmake
@@ -0,0 +1,40 @@
+option (ENABLE_REPLXX "Enable replxx support" ${ENABLE_LIBRARIES})
+
+if (ENABLE_REPLXX)
+    option (USE_INTERNAL_REPLXX "Use internal replxx library" ${NOT_UNBUNDLED})
+
+    if (USE_INTERNAL_REPLXX AND NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/replxx/README.md")
+       message (WARNING "submodule contrib/replxx is missing. to fix try run: \n git submodule update --init --recursive")
+       set (USE_INTERNAL_REPLXX 0)
+    endif ()
+
+    if (NOT USE_INTERNAL_REPLXX)
+        find_library(LIBRARY_REPLXX NAMES replxx replxx-static)
+        find_path(INCLUDE_REPLXX replxx.hxx)
+
+        add_library(replxx UNKNOWN IMPORTED)
+        set_property(TARGET replxx PROPERTY IMPORTED_LOCATION ${LIBRARY_REPLXX})
+        target_include_directories(replxx PUBLIC ${INCLUDE_REPLXX})
+
+        set(CMAKE_REQUIRED_LIBRARIES replxx)
+        check_cxx_source_compiles(
+            "
+            #include <replxx.hxx>
+            int main() {
+                replxx::Replxx rx;
+            }
+            "
+            EXTERNAL_REPLXX_WORKS
+        )
+
+        if (NOT EXTERNAL_REPLXX_WORKS)
+            message (FATAL_ERROR "replxx is unusable: ${LIBRARY_REPLXX} ${INCLUDE_REPLXX}")
+        endif ()
+    endif ()
+
+    set(USE_REPLXX 1)
+
+    message (STATUS "Using replxx")
+else ()
+    set(USE_REPLXX 0)
+endif ()
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index fe3e4e83f03..f81d616cddd 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -332,4 +332,6 @@ if (USE_FASTOPS)
     add_subdirectory (fastops-cmake)
 endif()
 
-add_subdirectory (replxx-cmake)
+if (USE_INTERNAL_REPLXX)
+    add_subdirectory (replxx-cmake)
+endif()
diff --git a/contrib/replxx-cmake/CMakeLists.txt b/contrib/replxx-cmake/CMakeLists.txt
index 389c1a7fb58..1e08b72f89a 100644
--- a/contrib/replxx-cmake/CMakeLists.txt
+++ b/contrib/replxx-cmake/CMakeLists.txt
@@ -1,55 +1,19 @@
-option (ENABLE_REPLXX "Enable replxx support" ${ENABLE_LIBRARIES})
+set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/replxx")
 
-if (ENABLE_REPLXX)
-    option (USE_INTERNAL_REPLXX "Use internal replxx library" ${NOT_UNBUNDLED})
+set(SRCS
+    ${LIBRARY_DIR}/src/conversion.cxx
+    ${LIBRARY_DIR}/src/ConvertUTF.cpp
+    ${LIBRARY_DIR}/src/escape.cxx
+    ${LIBRARY_DIR}/src/history.cxx
+    ${LIBRARY_DIR}/src/io.cxx
+    ${LIBRARY_DIR}/src/prompt.cxx
+    ${LIBRARY_DIR}/src/replxx.cxx
+    ${LIBRARY_DIR}/src/replxx_impl.cxx
+    ${LIBRARY_DIR}/src/util.cxx
+    ${LIBRARY_DIR}/src/wcwidth.cpp
+    ${LIBRARY_DIR}/src/windows.cxx
+)
 
-    if (USE_INTERNAL_REPLXX)
-        set (LIBRARY_DIR "${ClickHouse_SOURCE_DIR}/contrib/replxx")
-
-        set(SRCS
-            ${LIBRARY_DIR}/src/conversion.cxx
-            ${LIBRARY_DIR}/src/ConvertUTF.cpp
-            ${LIBRARY_DIR}/src/escape.cxx
-            ${LIBRARY_DIR}/src/history.cxx
-            ${LIBRARY_DIR}/src/io.cxx
-            ${LIBRARY_DIR}/src/prompt.cxx
-            ${LIBRARY_DIR}/src/replxx.cxx
-            ${LIBRARY_DIR}/src/replxx_impl.cxx
-            ${LIBRARY_DIR}/src/util.cxx
-            ${LIBRARY_DIR}/src/wcwidth.cpp
-            ${LIBRARY_DIR}/src/windows.cxx
-        )
-
-        add_library(replxx ${SRCS})
-        target_include_directories(replxx PUBLIC ${LIBRARY_DIR}/include)
-        target_compile_options(replxx PUBLIC -Wno-documentation)
-    else ()
-        find_library(LIBRARY_REPLXX NAMES replxx replxx-static)
-        find_path(INCLUDE_REPLXX replxx.hxx)
-
-        add_library(replxx UNKNOWN IMPORTED)
-        set_property(TARGET replxx PROPERTY IMPORTED_LOCATION ${LIBRARY_REPLXX})
-        target_include_directories(replxx PUBLIC ${INCLUDE_REPLXX})
-
-        set(CMAKE_REQUIRED_LIBRARIES replxx)
-        check_cxx_source_compiles(
-            "
-            #include <replxx.hxx>
-            int main() {
-                replxx::Replxx rx;
-            }
-            "
-            EXTERNAL_REPLXX_WORKS
-        )
-
-        if (NOT EXTERNAL_REPLXX_WORKS)
-            message (FATAL_ERROR "replxx is unusable: ${LIBRARY_REPLXX} ${INCLUDE_REPLXX}")
-        endif ()
-    endif ()
-
-    set(USE_REPLXX 1)
-
-    message (STATUS "Using replxx")
-else ()
-    set(USE_REPLXX 0)
-endif ()
+add_library(replxx ${SRCS})
+target_include_directories(replxx PUBLIC ${LIBRARY_DIR}/include)
+target_compile_options(replxx PUBLIC -Wno-documentation)