diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py
index c94db976..4f63cf62 100644
--- a/confluent_server/confluent/config/configmanager.py
+++ b/confluent_server/confluent/config/configmanager.py
@@ -1906,6 +1906,8 @@ class ConfigManager(object):
 
     @classmethod
     def wait_for_sync(cls, fullsync=False):
+        if cls._cfgwriter is not None:
+            cls._cfgwriter.join()
         cls._bg_sync_to_file(fullsync)
         if cls._cfgwriter is not None:
             cls._cfgwriter.join()