diff --git a/lib/utils/client_manager.dart b/lib/utils/client_manager.dart
index 524542d..56d9c3d 100644
--- a/lib/utils/client_manager.dart
+++ b/lib/utils/client_manager.dart
@@ -117,8 +117,8 @@ abstract class ClientManager {
         'im.ponies.room_emotes',
       },
       logLevel: kReleaseMode ? Level.warning : Level.verbose,
-      databaseBuilder: flutterMatrixSdkDatabaseBuilder,
-      //legacyDatabaseBuilder: FlutterHiveCollectionsDatabase.databaseBuilder,
+      //database: flutterMatrixSdkDatabaseBuilder(client),
+      legacyDatabaseBuilder: flutterMatrixSdkDatabaseBuilder,
       supportedLoginTypes: {
         AuthenticationTypes.password,
         AuthenticationTypes.sso,
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 138d8db..44bc89b 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
@@ -63,7 +63,7 @@ Future<DatabaseApi> flutterMatrixSdkDatabaseBuilder(Client client) async {
 Future<MatrixSdkDatabase> _constructDatabase(Client client) async {
   if (kIsWeb) {
     html.window.navigator.storage?.persist();
-    return MatrixSdkDatabase(client.clientName);
+    return MatrixSdkDatabase.init(client.clientName);
   }
 
   final cipher = await getDatabaseCipher();
@@ -113,7 +113,7 @@ Future<MatrixSdkDatabase> _constructDatabase(Client client) async {
     ),
   );
 
-  return MatrixSdkDatabase(
+  return MatrixSdkDatabase.init(
     client.clientName,
     database: database,
     maxFileSize: 1000 * 1000 * 10,
diff --git a/pubspec.lock b/pubspec.lock
index dae4dce..a7960d7 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -1153,10 +1153,11 @@ packages:
   matrix:
     dependency: "direct main"
     description:
-      name: matrix
-      sha256: "7d15fdbc760be7e40c58bb65e03baa8241b1e31db2bc67dab61883aabc083a85"
-      url: "https://pub.dev"
-    source: hosted
+      path: "."
+      ref: main
+      resolved-ref: "6f3bdad65c079a3784ce487f320195f93a8708a8"
+      url: "https://git.extera.xyz/OfficialDakari/MatrixDartSdk.git"
+    source: git
     version: "0.40.0"
   meta:
     dependency: transitive
diff --git a/pubspec.yaml b/pubspec.yaml
index 6763872..b735546 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -62,7 +62,10 @@ dependencies:
   latlong2: ^0.9.1
   linkify: ^5.0.0
   material: ^1.0.0+2
-  matrix: 0.40.0
+  matrix:
+    git:
+      url: https://git.extera.xyz/OfficialDakari/MatrixDartSdk.git
+      ref: main
   mime: ^1.0.6
   native_imaging: ^0.2.0
   opus_caf_converter_dart: ^1.0.1