diff --git a/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart b/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart
index 3387fdf38..b7ff5a8ab 100644
--- a/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart
+++ b/lib/utils/matrix_sdk_extensions/flutter_matrix_dart_sdk_database/builder.dart
@@ -65,7 +65,12 @@ Future<MatrixSdkDatabase> _constructDatabase(String clientName) async {
 
   Directory? fileStorageLocation;
   try {
-    fileStorageLocation = await getTemporaryDirectory();
+    final tmpDir = await getTemporaryDirectory();
+    final appTmpDir = Directory(join(tmpDir.path, clientName));
+    if (!await appTmpDir.exists()) {
+      await appTmpDir.create(recursive: true);
+    }
+    fileStorageLocation = appTmpDir;
   } on MissingPlatformDirectoryException catch (_) {
     Logs().w(
       'No temporary directory for file cache available on this platform.',