diff --git a/cmake/find/zlib.cmake b/cmake/find/zlib.cmake
index bd96424b60d..f66f9e6713d 100644
--- a/cmake/find/zlib.cmake
+++ b/cmake/find/zlib.cmake
@@ -29,6 +29,9 @@ if (NOT USE_INTERNAL_ZLIB_LIBRARY)
 endif ()
 
 if (NOT ZLIB_FOUND AND NOT MISSING_INTERNAL_ZLIB_LIBRARY)
+    # https://github.com/zlib-ng/zlib-ng/pull/733
+    # This is disabed by default
+    add_compile_definitions(Z_TLS=__thread)
     set (USE_INTERNAL_ZLIB_LIBRARY 1)
     set (ZLIB_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/${INTERNAL_ZLIB_NAME}" "${ClickHouse_BINARY_DIR}/contrib/${INTERNAL_ZLIB_NAME}" CACHE INTERNAL "") # generated zconf.h
     set (ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR}) # for poco
diff --git a/src/IO/ZlibDeflatingWriteBuffer.h b/src/IO/ZlibDeflatingWriteBuffer.h
index 6f623f55f56..132f529cc54 100644
--- a/src/IO/ZlibDeflatingWriteBuffer.h
+++ b/src/IO/ZlibDeflatingWriteBuffer.h
@@ -4,6 +4,7 @@
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/CompressionMethod.h>
 
+
 #include <zlib.h>
 
 
diff --git a/src/IO/ZlibInflatingReadBuffer.h b/src/IO/ZlibInflatingReadBuffer.h
index b8c141e9b9b..e868dd6999d 100644
--- a/src/IO/ZlibInflatingReadBuffer.h
+++ b/src/IO/ZlibInflatingReadBuffer.h
@@ -4,6 +4,7 @@
 #include <IO/BufferWithOwnMemory.h>
 #include <IO/CompressionMethod.h>
 
+
 #include <zlib.h>
 
 
diff --git a/src/IO/examples/zlib_ng_bug.cpp b/src/IO/examples/zlib_ng_bug.cpp
index e9b3c448b88..9fe3c961913 100644
--- a/src/IO/examples/zlib_ng_bug.cpp
+++ b/src/IO/examples/zlib_ng_bug.cpp
@@ -1,6 +1,7 @@
 #include <unistd.h>
 #include <vector>
 #include <stdexcept>
+
 #include <zlib.h>
 
 #pragma GCC diagnostic ignored "-Wold-style-cast"