diff --git a/pubspec.lock b/pubspec.lock
index 3992da04..efe1da6c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -418,13 +418,15 @@ packages:
       name: flutter_math_fork
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.3.3+1"
+    version: "0.4.1"
   flutter_matrix_html:
     dependency: "direct main"
     description:
-      name: flutter_matrix_html
-      url: "https://pub.dartlang.org"
-    source: hosted
+      path: "."
+      ref: HEAD
+      resolved-ref: "0f5677e15d14072455dfe56a33df75010bc3bf87"
+      url: "https://github.com/Sorunome/flutter_matrix_html.git"
+    source: git
     version: "1.0.4"
   flutter_native_splash:
     dependency: "direct dev"
diff --git a/pubspec.yaml b/pubspec.yaml
index 97fdbac7..9935103a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -35,7 +35,8 @@ dependencies:
   flutter_localizations:
     sdk: flutter
   flutter_map: ^0.14.0
-  flutter_matrix_html: ^1.0.4
+  flutter_matrix_html: # Use git version until flutter_math_fork is updated to 0.4.X
+    git: https://github.com/Sorunome/flutter_matrix_html.git
   flutter_olm: ^1.1.2
   flutter_openssl_crypto: ^0.0.1
   flutter_secure_storage: ^4.2.1
@@ -62,7 +63,7 @@ dependencies:
   path_provider: ^2.0.2
   permission_handler: ^8.1.4+2
   pin_code_text_field: ^1.8.0
-  provider: ^5.0.0
+  provider: ^6.0.0
   punycode: ^1.0.0
   qr_code_scanner: ^0.5.2
   qr_flutter: ^4.0.0
@@ -115,3 +116,6 @@ flutter:
         - asset: fonts/NotoSans/NotoSans-BoldItalic.ttf
           weight: 700
           style: italic
+
+dependency_overrides:
+  provider: 5.0.0
\ No newline at end of file