diff --git a/client/src/components/Logout.js b/client/src/components/Logout.js
index 5e7f45de8..4876ab330 100644
--- a/client/src/components/Logout.js
+++ b/client/src/components/Logout.js
@@ -1,12 +1,11 @@
-import React, { Component } from 'react'
+import React, { Component } from 'react';
+import {Redirect} from 'react-router';
 
 class Logout extends Component {
   render() {
-    return (
-        <div>
-          Login out...
-        </div>
-    )
+    window.localStorage.removeItem("user");
+
+    return <Redirect to='/' />
   }
 }
 
diff --git a/client/src/components/NavBar.js b/client/src/components/NavBar.js
index b06d7fdeb..7e52dd246 100644
--- a/client/src/components/NavBar.js
+++ b/client/src/components/NavBar.js
@@ -51,9 +51,11 @@ class NavBar extends Component {
   componentDidMount() {
     const getUser = window.localStorage.getItem("user");
     let user = JSON.parse(getUser)
-    const authId = user.sub;
 
-    this.setState({ authId: authId });
+    if (user) {
+      const authId = user.sub;
+      this.setState({ authId: authId });
+    }    
   }
 
   render() {