diff --git a/www/assets/js/client.js b/www/assets/js/client.js
index 8fbc43bc..9c273b37 100644
--- a/www/assets/js/client.js
+++ b/www/assets/js/client.js
@@ -79,7 +79,7 @@ if(params["novideo"] != undefined) {
 if(params["channel"] == undefined) {
     // Match URLs of the form http://site.tld/r/channel
     var loc = document.location+"";
-    var m = loc.match(/\/r\/([a-zA-Z0-9]+)/);
+    var m = loc.match(/\/r\/([a-zA-Z0-9]+)$/);
     if(m) {
         socket.emit("joinChannel", {
             name: m[1]