diff --git a/rpc.js b/rpc.js
index 50713e1bd..66c8af873 100644
--- a/rpc.js
+++ b/rpc.js
@@ -18,9 +18,11 @@ var isValidChannel = function (chan) {
 var checkSignature = function (signedMsg, publicKey) {
     if (!(signedMsg && publicKey)) { return null; }
 
+    var signedBuffer;
+    var pubBuffer;
     try {
-        var signedBuffer = Nacl.util.decodeBase64(signedMsg);
-        var pubBuffer = Nacl.util.decodeBase64(publicKey);
+        signedBuffer = Nacl.util.decodeBase64(signedMsg);
+        pubBuffer = Nacl.util.decodeBase64(publicKey);
     } catch (e) {
         return null;
     }
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index f6e51a35e..673a961b4 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1018,7 +1018,7 @@ define([
             parsed = common.parseHash(parsed.hash);
 
             if (parsed.version === 0) {
-                return channel;
+                return parsed.channel;
             } else if (parsed.version !== 1) {
                 console.error("parsed href had no version");
                 console.error(parsed);