diff --git a/www/common/cryptget.js b/www/common/cryptget.js
index d74bcee1d..80feacec0 100644
--- a/www/common/cryptget.js
+++ b/www/common/cryptget.js
@@ -70,10 +70,16 @@ define([
             TextPatcher.create({
                 realtime: realtime,
             })(doc);
-            realtime.sync();
-            realtime.abort();
 
-            finish(Session, void 0);
+            var to = window.setTimeout(function () {
+                cb(new Error("Timeout"));
+            }, 5000);
+
+            Cryptpad.whenRealtimeSyncs(realtime, function () {
+                window.clearTimeout(to);
+                realtime.abort();
+                finish(Session, void 0);
+            });
         };
         overwrite(config, opt);