Merge branch 'master' into webpack-frontend

1 files changed, 2 insertions, 2 deletions

diff --git a/lib/realtime.js b/lib/realtime.js
index ea3735a6..d069a486 100644
--- a/lib/realtime.js
+++ b/lib/realtime.js
@@ -396,7 +396,7 @@ function finishConnection(socket, note, user) {
     // update user note history
     setTimeout(function () {
         var noteId = note.alias ? note.alias : LZString.compressToBase64(note.id);
-        history.updateHistory(user.userid, noteId, note.server.document);
+        if (note.server) history.updateHistory(user.userid, noteId, note.server.document);
     }, 0);
 
     emitOnlineUsers(socket);
@@ -669,7 +669,7 @@ function operationCallback(socket, operation) {
         // update user note history
         setTimeout(function() {
             var noteId = note.alias ? note.alias : LZString.compressToBase64(note.id);
-            history.updateHistory(userId, noteId, note.server.document);
+            if (note.server) history.updateHistory(userId, noteId, note.server.document);
         }, 0);
         
     }