diff --git a/client/src/App/App.js b/client/src/App/App.js
index fe3fdfe30..bf8b7b9dc 100644
--- a/client/src/App/App.js
+++ b/client/src/App/App.js
@@ -39,8 +39,8 @@ export default function App({ authState }) {
       ...initialState,
       currentUser: {
         __typename: null,
-        email: authState.user.email,
-        displayName: authState.user.displayName
+        email: authState.user ? authState.user.email : null,
+        displayName: authState.user ? authState.user.displayName : null
       }
     }
   });