diff --git a/common/browser-websockets.js b/common/browser-websockets.js
index 3e0be5ef..0c049f38 100644
--- a/common/browser-websockets.js
+++ b/common/browser-websockets.js
@@ -60,6 +60,8 @@ export const init = ({ resource = "", viewer, onUpdate }) => {
       console.log(e);
     }
 
+    console.log(`Received message of type ${type}`);
+
     if (!data) {
       return null;
     }
@@ -68,7 +70,7 @@ export const init = ({ resource = "", viewer, onUpdate }) => {
       return null;
     }
 
-    if (type === "UPDATE" && onUpdate) {
+    if (type === "UPDATE") {
       onUpdate(data);
     }
   });
diff --git a/components/core/Application.js b/components/core/Application.js
index db139f27..4f8d6c4d 100644
--- a/components/core/Application.js
+++ b/components/core/Application.js
@@ -154,6 +154,7 @@ export default class ApplicationPage extends React.Component {
     //     )
     //   );
     // await setAsyncState(newViewerState);
+    console.log("Handle update viewer called");
 
     this.setState({
       viewer: { ...this.state.viewer, ...newViewerState, type: "VIEWER" },
diff --git a/node_common/nodejs-websocket.js b/node_common/nodejs-websocket.js
index 1f50112a..fbbce96a 100644
--- a/node_common/nodejs-websocket.js
+++ b/node_common/nodejs-websocket.js
@@ -24,6 +24,7 @@ export const create = () => {
     clearTimeout(this.pingTimeout);
 
     this.pingTimeout = setTimeout(() => {
+      NodeLogging.log(`Did not receive ping in time. Disconnecting websocket`);
       this.terminate();
     }, 30000 + 1000);
   });
@@ -35,10 +36,9 @@ export const create = () => {
   ws.on("close", () => {
     global.websocket = null;
     console.log(global.websocket);
-    console.log("Websocket disconnected");
+    NodeLogging.log(`Websocket disconnected`);
   });
 
-  console.log("Websocket server started");
   NodeLogging.log(`Websocket server started`);
 
   global.websocket = ws;