diff --git a/src/communicator/__init__.py b/src/communicator/__init__.py
index 304e8011..4091ced3 100755
--- a/src/communicator/__init__.py
+++ b/src/communicator/__init__.py
@@ -242,8 +242,9 @@ class OnionrCommunicatorDaemon:
                 'First run detected. Run openhome to get setup.',
                 terminal=True)
 
-            while not config.get('onboarding.done', True):
-                time.sleep(5)
+            while not config.get('onboarding.done', True) and \
+                    not self.shutdown:
+                time.sleep(2)
 
         # Main daemon loop, mainly for calling timers,
         # don't do any complex operations here to avoid locking