diff --git a/lib/data/hive/hive_collection_tom_database.dart b/lib/data/hive/hive_collection_tom_database.dart
index 3fc41f2667..c66504e431 100644
--- a/lib/data/hive/hive_collection_tom_database.dart
+++ b/lib/data/hive/hive_collection_tom_database.dart
@@ -123,7 +123,7 @@ class HiveCollectionToMDatabase {
     Logs().w('Delete database and storage key...');
     await const FlutterSecureStorage()
         .delete(key: FlutterHiveCollectionsDatabase.cipherStorageKey);
-    await _collection.deleteFromDisk();
+    await tomConfigurationsBox.clear();
     await Hive.deleteFromDisk();
   }
 }
diff --git a/lib/widgets/matrix.dart b/lib/widgets/matrix.dart
index cce66c54d6..db700fbe33 100644
--- a/lib/widgets/matrix.dart
+++ b/lib/widgets/matrix.dart
@@ -360,6 +360,7 @@ class MatrixState extends State<Matrix> with WidgetsBindingObserver {
           navigatorContext?.go('/rooms');
         } else {
           await getIt.get<HiveCollectionToMDatabase>().clear();
+          await c.clear();
         }
       }
     });