diff --git a/rhodecode/config/config_maker.py b/rhodecode/config/config_maker.py
index 3f71e878..1b1b8bf4 100644
--- a/rhodecode/config/config_maker.py
+++ b/rhodecode/config/config_maker.py
@@ -165,7 +165,7 @@ def sanitize_settings_and_apply_defaults(global_config, settings):
     )
 
     # celery
-    broker_url = settings_maker.make_setting('celery.broker_url', 'redis://redis:6379/8')
+    broker_url = settings_maker.make_setting('celery.broker_url', 'redis://redis:6379/8', default_when_empty=True)
     settings_maker.make_setting('celery.result_backend', broker_url)
 
     settings_maker.make_setting('exception_tracker.send_email', False, parser='bool')