diff --git a/poller-service.py b/poller-service.py
index 0989b27a2..178282026 100755
--- a/poller-service.py
+++ b/poller-service.py
@@ -242,7 +242,7 @@ while True:
         devices_scanned = 0
         next_update = datetime.now() + timedelta(minutes=1)
 
-    while threading.active_count() >= amount_of_workers:
+    while threading.active_count() >= amount_of_workers or not lockFree('schema_update'):
         time.sleep(.5)
 
     try: