diff --git a/rosbridge_server/scripts/rosbridge_websocket.py b/rosbridge_server/scripts/rosbridge_websocket.py
index 32e25e2d7..bbec7f6be 100755
--- a/rosbridge_server/scripts/rosbridge_websocket.py
+++ b/rosbridge_server/scripts/rosbridge_websocket.py
@@ -146,12 +146,11 @@ def __init__(self):
         # Done with parameter handling                   #
         ##################################################
 
+        handlers = [(r"/", RosbridgeWebSocket), (r"", RosbridgeWebSocket)]
         if url_path != "/":
-            application = Application([(rf"{url_path}", RosbridgeWebSocket)], **tornado_settings)
-        else:
-            application = Application(
-                [(r"/", RosbridgeWebSocket), (r"", RosbridgeWebSocket)], **tornado_settings
-            )
+            handlers = [(rf"{url_path}", RosbridgeWebSocket)]
+
+        application = Application(handlers, **tornado_settings)
 
         connected = False
         while not connected and self.context.ok():