diff --git a/src/app/organisms/navigation/Drawer.jsx b/src/app/organisms/navigation/Drawer.jsx
index b76347e5..5e9d2fb4 100644
--- a/src/app/organisms/navigation/Drawer.jsx
+++ b/src/app/organisms/navigation/Drawer.jsx
@@ -6,6 +6,7 @@ import cons from '../../../client/state/cons';
 import navigation from '../../../client/state/navigation';
 import { selectTab, selectSpace } from '../../../client/action/navigation';
 
+import Text from '../../atoms/text/Text';
 import ScrollView from '../../atoms/scroll/ScrollView';
 
 import DrawerHeader from './DrawerHeader';
@@ -14,6 +15,7 @@ import Home from './Home';
 import Directs from './Directs';
 
 function Drawer() {
+  const [systemState, setSystemState] = useState(null);
   const [selectedTab, setSelectedTab] = useState(navigation.selectedTab);
   const [spaceId, setSpaceId] = useState(navigation.selectedSpaceId);
 
@@ -30,6 +32,13 @@ function Drawer() {
     else selectSpace(navigation.selectedSpacePath[lRoomIndex - 1]);
   }
 
+  function handleSystemState(state) {
+    if (state === 'ERROR' || state === 'RECONNECTING' || state === 'STOPPED') {
+      setSystemState({ status: 'Connection lost!' });
+    }
+    if (systemState !== null) setSystemState(null);
+  }
+
   useEffect(() => {
     navigation.on(cons.events.navigation.TAB_SELECTED, onTabSelected);
     navigation.on(cons.events.navigation.SPACE_SELECTED, onSpaceSelected);
@@ -40,6 +49,13 @@ function Drawer() {
       initMatrix.roomList.removeListener(cons.events.roomList.ROOM_LEAVED, onRoomLeaved);
     };
   }, []);
+  useEffect(() => {
+    initMatrix.matrixClient.on('sync', handleSystemState);
+    return () => {
+      initMatrix.matrixClient.removeListener('sync', handleSystemState);
+    };
+  }, [systemState]);
+
   return (
     <div className="drawer">
       <DrawerHeader selectedTab={selectedTab} spaceId={spaceId} />
@@ -57,6 +73,11 @@ function Drawer() {
           </ScrollView>
         </div>
       </div>
+      { systemState !== null && (
+        <div className="drawer__state">
+          <Text>{systemState.status}</Text>
+        </div>
+      )}
     </div>
   );
 }
diff --git a/src/app/organisms/navigation/Drawer.scss b/src/app/organisms/navigation/Drawer.scss
index e93761a2..c16b9748 100644
--- a/src/app/organisms/navigation/Drawer.scss
+++ b/src/app/organisms/navigation/Drawer.scss
@@ -26,6 +26,17 @@
     @extend .drawer-flexItem;
     @extend .drawer-flexBox;
   }
+
+  &__state {
+    padding: var(--sp-extra-tight);
+    border-top: 1px solid var(--bg-surface-border);
+    display: flex;
+    justify-content: center;
+
+    & .text {
+      color: var(--tc-danger-high);
+    }
+  }
 }
 .rooms__wrapper {
   @extend .drawer-flexItem;