diff --git a/src/components/session/withAuthentication.js b/src/components/session/withAuthentication.js
index 94f3b29..fdef9e1 100644
--- a/src/components/session/withAuthentication.js
+++ b/src/components/session/withAuthentication.js
@@ -21,13 +21,15 @@ const withAuthentication = Component => {
       this.listener = this.props.firebase.auth.onAuthStateChanged(
         authUser => {
           localStorage.setItem("authUser", JSON.stringify(authUser))
-          this.setState({
-            authUser: {
-              uid: authUser.uid,
-              email: authUser.email,
-              emailVerified: authUser.emailVerified,
-            },
-          })
+          if (authUser) {
+            this.setState({
+              authUser: {
+                uid: authUser.uid,
+                email: authUser.email,
+                emailVerified: authUser.emailVerified,
+              },
+            })
+          }
         },
         () => {
           localStorage.removeItem("authUser")