diff --git a/src/ClientContext.tsx b/src/ClientContext.tsx
index 1ffced8f..ebe84f7e 100644
--- a/src/ClientContext.tsx
+++ b/src/ClientContext.tsx
@@ -124,10 +124,10 @@ export const ClientProvider: FC<Props> = ({ children }) => {
 
   const onSync = (state: SyncState, _old: SyncState, data: ISyncStateData) => {
     setState((currentState) => {
-      return {
-        ...currentState,
-        disconnected: isDisconnected(state, data),
-      };
+      const disconnected = isDisconnected(state, data);
+      return disconnected === currentState.disconnected
+        ? currentState
+        : { ...currentState, disconnected };
     });
   };
 
@@ -205,7 +205,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
         }
       }
     };
-    let clientWithListener;
+    let clientWithListener: MatrixClient;
     init()
       .then(({ client, isPasswordlessUser }) => {
         clientWithListener = client;
diff --git a/src/DisconnectedBanner.module.css b/src/DisconnectedBanner.module.css
index 333c99d3..5827953d 100644
--- a/src/DisconnectedBanner.module.css
+++ b/src/DisconnectedBanner.module.css
@@ -23,5 +23,5 @@ limitations under the License.
   text-align: center;
   z-index: 1;
   top: 76px;
-  width: 100%;
+  width: calc(100% - 58px);
 }
diff --git a/src/initializer.tsx b/src/initializer.tsx
index c6507668..ceea035b 100644
--- a/src/initializer.tsx
+++ b/src/initializer.tsx
@@ -48,7 +48,7 @@ export class Initializer {
   private isInitialized = false;
 
   public static isInitialized(): boolean {
-    return Boolean(Initializer.internalInstance?.isInitialized);
+    return Initializer.internalInstance?.isInitialized;
   }
 
   public static initBeforeReact() {