diff --git a/lib/src/database/hive_collections_database.dart b/lib/src/database/hive_collections_database.dart
index fd6a5e80..b9d10d26 100644
--- a/lib/src/database/hive_collections_database.dart
+++ b/lib/src/database/hive_collections_database.dart
@@ -229,7 +229,28 @@ class HiveCollectionsDatabase extends DatabaseApi {
   }
 
   @override
-  Future<void> clear() => _collection.deleteFromDisk();
+  Future<void> clear() => Future.wait([
+        _clientBox.clear(),
+        _accountDataBox.clear(),
+        _roomsBox.clear(),
+        _roomStateBox.clear(),
+        _roomMembersBox.clear(),
+        _toDeviceQueueBox.clear(),
+        _roomAccountDataBox.clear(),
+        _inboundGroupSessionsBox.clear(),
+        _outboundGroupSessionsBox.clear(),
+        _olmSessionsBox.clear(),
+        _userDeviceKeysBox.clear(),
+        _userDeviceKeysOutdatedBox.clear(),
+        _userCrossSigningKeysBox.clear(),
+        _ssssCacheBox.clear(),
+        _presencesBox.clear(),
+        _timelineFragmentsBox.clear(),
+        _eventsBox.clear(),
+        _seenDeviceIdsBox.clear(),
+        _seenDeviceKeysBox.clear(),
+        _collection.deleteFromDisk(),
+      ]);
 
   @override
   Future<void> clearCache() => transaction(() async {