diff --git a/src/ClientContext.tsx b/src/ClientContext.tsx
index 24b067a..c026781 100644
--- a/src/ClientContext.tsx
+++ b/src/ClientContext.tsx
@@ -254,6 +254,7 @@ export const ClientProvider: FC<Props> = ({ children }) => {
 
   const logout = useCallback(async () => {
     await client.logout(undefined, true);
+    await client.clearStores();
     clearSession();
     setState({
       client: undefined,
diff --git a/src/matrix-utils.ts b/src/matrix-utils.ts
index 3d93a33..321c769 100644
--- a/src/matrix-utils.ts
+++ b/src/matrix-utils.ts
@@ -84,7 +84,7 @@ export async function initClient(
 
   const storeOpts = {} as ICreateClientOpts;
 
-  if (indexedDB && localStorage && !import.meta.env.DEV) {
+  if (indexedDB && localStorage /*&& !import.meta.env.DEV*/) {
     storeOpts.store = new IndexedDBStore({
       indexedDB: window.indexedDB,
       localStorage,