diff --git a/app/components/SocketProvider.js b/app/components/SocketProvider.js
index 6823357a3..605dcfc77 100644
--- a/app/components/SocketProvider.js
+++ b/app/components/SocketProvider.js
@@ -195,7 +195,9 @@ class SocketProvider extends React.Component<Props> {
   }
 
   componentWillUnmount() {
-    this.socket.disconnect();
+    if (this.socket) {
+      this.socket.disconnect();
+    }
   }
 
   render() {