diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
index 56da44983..a96d7c433 100644
--- a/src/components/app/DocumentList.js
+++ b/src/components/app/DocumentList.js
@@ -190,7 +190,7 @@ class DocumentList extends Component {
     connectWS = (viewId) => {
         const {windowType} = this.props;
         connectWS.call(this, '/view/' + viewId, (msg) => {
-            const {fullyChanged, changedIds} = msg.body;
+            const {fullyChanged, changedIds} = msg;
             if(changedIds){
                 getDataByIds(
                     'documentView', windowType, viewId, changedIds.join()
diff --git a/src/containers/MasterWindow.js b/src/containers/MasterWindow.js
index 80efec867..c4e70b59a 100644
--- a/src/containers/MasterWindow.js
+++ b/src/containers/MasterWindow.js
@@ -52,6 +52,9 @@ class MasterWindow extends Component {
             JSON.stringify(prevProps.me.language) !==
             JSON.stringify(this.props.me.language)
         ){
+            if(!params.windowType && !params.docId){
+                return;
+            }
             dispatch(replace(''));
             dispatch(replace(
                 '/window/' + params.windowType + '/' + params.docId)