diff --git a/jdav_web/jdav_web/settings.py b/jdav_web/jdav_web/settings.py
index 9f0b80e..2f7b753 100644
--- a/jdav_web/jdav_web/settings.py
+++ b/jdav_web/jdav_web/settings.py
@@ -175,4 +175,4 @@ ADMINS = (('admin', 'christian@merten-moser.de'),)
 # Celery and Redis setup
 REDIS_HOST = 'localhost'
 REDIS_PORT = '6379'
-BROKER_URL = 'redis://' + REDIS_HOST + ':' + REDIS_PORT + '/0'
+BROKER_URL = os.environ.get('BROKER_URL', 'redis://' + REDIS_HOST + ':' + REDIS_PORT + '/0')