diff --git a/www/common/common-hash.js b/www/common/common-hash.js
index 888c0a338..5ed7ece36 100644
--- a/www/common/common-hash.js
+++ b/www/common/common-hash.js
@@ -214,6 +214,10 @@ Version 1
 
     Hash.getHashes = function (channel, secret) {
         var hashes = {};
+        if (!secret.keys) {
+            console.error('e');
+            return hashes;
+        }
         if (secret.keys.editKeyStr) {
             hashes.editHash = getEditHashFromKeys(channel, secret.keys);
         }
diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js
index 08d08580a..f1501883a 100644
--- a/www/common/cryptpad-common.js
+++ b/www/common/cryptpad-common.js
@@ -1851,6 +1851,11 @@ define([
             if (!parsed.type || !parsed.hashData) { return void cb('E_INVALID_HREF'); }
             var hashes = common.getHashes(secret.channel, secret);
 
+            if (!hashes.editHash && !hashes.viewHash && parsed.hashData && !parsed.hashData.mode) {
+                // It means we're using an old hash
+                hashes.editHash = window.location.hash.slice(1);
+            }
+
             // If we have a stronger version in drive, add it and add a redirect button
             var stronger = recent && common.findStronger(null, recent);
             if (stronger) {