diff --git a/bazarr/app.py b/bazarr/app.py
index 18318477a..f24f821e4 100644
--- a/bazarr/app.py
+++ b/bazarr/app.py
@@ -15,7 +15,7 @@ def create_app():
     app = Flask(__name__,
                 template_folder=os.path.join(os.path.dirname(__file__), '..', 'views'),
                 static_folder=os.path.join(os.path.dirname(__file__), '..', 'static'),
-                static_url_path=base_url + 'static')
+                static_url_path=base_url.rstrip('/') + '/static')
     app.route = prefix_route(app.route, base_url.rstrip('/'))
 
     app.config["SECRET_KEY"] = 'test'
@@ -39,7 +39,7 @@ def create_app():
     def http_error_handler(error):
         return redirect(base_url.rstrip('/')), 302
 
-    socketio.init_app(app, path=base_url+'socket.io', cors_allowed_origins='*')
+    socketio.init_app(app, path=base_url.rstrip('/')+'/socket.io', cors_allowed_origins='*')
     return app
 
 
diff --git a/views/_main.html b/views/_main.html
index 73849091d..b6d7c20e5 100644
--- a/views/_main.html
+++ b/views/_main.html
@@ -280,7 +280,7 @@
             });
 
             events = io.connect({
-                path: '{{ settings.general.base_url }}socket.io',
+                path: '{{ settings.general.base_url.rstrip('/') }}/socket.io',
                 upgrade: false,
                 reconnection: true,
                 reconnectionDelay: 1000,