diff --git a/src/Common/ZooKeeper/TestKeeperStorage.cpp b/src/Common/ZooKeeper/TestKeeperStorage.cpp
index a374f752b18..262a0b372a2 100644
--- a/src/Common/ZooKeeper/TestKeeperStorage.cpp
+++ b/src/Common/ZooKeeper/TestKeeperStorage.cpp
@@ -528,8 +528,12 @@ void TestKeeperStorage::finalize()
 
         if (shutdown)
             return;
+
         shutdown = true;
+
+        processing_thread.join();
     }
+
     try
     {
         {