diff --git a/notifications.py b/notifications.py
index 08281a9..71cb4c5 100644
--- a/notifications.py
+++ b/notifications.py
@@ -6,6 +6,9 @@ def send_notification(app, target_user, mapname, old_replay, new_replay):
 
     url =  app.config["DISPATCH_SERVER"]
 
+    if not url:
+        return
+
     # send to event dispatcher #
     message = "Trackmania: Record broken on {}".format(mapname)
     message += "Old time: {}".format(old_replay.get_human_readable_time())
diff --git a/server.py b/server.py
index 82d72ad..55c0e0b 100755
--- a/server.py
+++ b/server.py
@@ -438,8 +438,13 @@ def check_replay_trigger(replay):
         notifications.send_notification(app, settings.user, map_obj.map_uid, second, replay)
 
 def create_app():
+
     db.create_all()
 
+    app.config["DISPATCH_SERVER"] = os.environ.get("DISPATCH_SERVER")
+    if app.config["DISPATCH_SERVER"]:
+        app.config["DISPATCH_AUTH"] = (os.environ["DISPATCH_AUTH_USER"], os.environ["DISPATCH_AUTH_PASSWORD"])
+
 if __name__ == "__main__":
 
     parser = argparse.ArgumentParser(description='TM Replay Server',