diff --git a/htdocs/js/mpd.js b/htdocs/js/mpd.js
index 0e3c09a..ccde921 100644
--- a/htdocs/js/mpd.js
+++ b/htdocs/js/mpd.js
@@ -545,6 +545,7 @@ function get_appropriate_ws_url()
 {
     var pcol;
     var u = document.URL;
+    var separator;
 
     /*
     /* We open the websocket encrypted if this page came on an
@@ -562,7 +563,13 @@ function get_appropriate_ws_url()
 
     u = u.split('#');
 
-    return pcol + u[0] + "/ws";
+    if (/\/$/.test(u[0])) {
+        separator = "";
+    } else {
+        separator = "/";
+    }
+
+    return pcol + u[0] + separator + "ws";
 }
 
 var updateVolumeIcon = function(volume)