diff --git a/.github/workflows/versions.env b/.github/workflows/versions.env
index 3fb81f741..459924f12 100644
--- a/.github/workflows/versions.env
+++ b/.github/workflows/versions.env
@@ -1,2 +1,2 @@
-flutter_version=3.27.4
-dart_version=3.6.2
\ No newline at end of file
+flutter_version=3.29.2
+dart_version=3.7.2
\ No newline at end of file
diff --git a/analysis_options.yaml b/analysis_options.yaml
index 55408e809..8378c682c 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -26,7 +26,6 @@ linter:
     throw_in_finally: true
     unawaited_futures: true
     unnecessary_statements: true
-    unsafe_html: true
 
     # Readability & Style
     # These are opinionated choices, where Dart gives us 2 ways to express the same thing.
diff --git a/lib/matrix_api_lite/utils/print_logs_web.dart b/lib/matrix_api_lite/utils/print_logs_web.dart
index b24ffd4bc..3198105c1 100644
--- a/lib/matrix_api_lite/utils/print_logs_web.dart
+++ b/lib/matrix_api_lite/utils/print_logs_web.dart
@@ -1,4 +1,6 @@
-import 'dart:html';
+import 'dart:js_interop';
+
+import 'package:web/web.dart' as web;
 
 import 'package:matrix/matrix_api_lite.dart';
 
@@ -13,22 +15,22 @@ extension PrintLogs on LogEvent {
     }
     switch (level) {
       case Level.wtf:
-        window.console.error('!!!CRITICAL!!! $logsStr');
+        web.console.error('!!!CRITICAL!!! $logsStr'.toJS);
         break;
       case Level.error:
-        window.console.error(logsStr);
+        web.console.error(logsStr.toJS);
         break;
       case Level.warning:
-        window.console.warn(logsStr);
+        web.console.warn(logsStr.toJS);
         break;
       case Level.info:
-        window.console.info(logsStr);
+        web.console.info(logsStr.toJS);
         break;
       case Level.debug:
-        window.console.debug(logsStr);
+        web.console.debug(logsStr.toJS);
         break;
       case Level.verbose:
-        window.console.log(logsStr);
+        web.console.log(logsStr.toJS);
         break;
     }
   }
diff --git a/lib/src/database/indexeddb_box.dart b/lib/src/database/indexeddb_box.dart
index 080b1ad5e..8ab69766c 100644
--- a/lib/src/database/indexeddb_box.dart
+++ b/lib/src/database/indexeddb_box.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: deprecated_member_use
+
 import 'dart:async';
 import 'dart:html';
 import 'dart:indexed_db';
diff --git a/lib/src/utils/crypto/subtle.dart b/lib/src/utils/crypto/subtle.dart
index d1cb7c13f..b81ddaf28 100644
--- a/lib/src/utils/crypto/subtle.dart
+++ b/lib/src/utils/crypto/subtle.dart
@@ -1,6 +1,8 @@
 // Copyright (c) 2020 Famedly GmbH
 // SPDX-License-Identifier: AGPL-3.0-or-later
 
+// ignore_for_file: deprecated_member_use
+
 import 'dart:async';
 import 'dart:js_util';
 import 'dart:typed_data';
diff --git a/lib/src/utils/web_worker/native_implementations_web_worker.dart b/lib/src/utils/web_worker/native_implementations_web_worker.dart
index 6cd71a69d..cf9086f6b 100644
--- a/lib/src/utils/web_worker/native_implementations_web_worker.dart
+++ b/lib/src/utils/web_worker/native_implementations_web_worker.dart
@@ -1,3 +1,5 @@
+// ignore_for_file: deprecated_member_use
+
 import 'dart:async';
 import 'dart:collection';
 import 'dart:html';
diff --git a/lib/src/utils/web_worker/web_worker.dart b/lib/src/utils/web_worker/web_worker.dart
index 89180856a..e427392ad 100644
--- a/lib/src/utils/web_worker/web_worker.dart
+++ b/lib/src/utils/web_worker/web_worker.dart
@@ -1,4 +1,4 @@
-// ignore_for_file: avoid_print
+// ignore_for_file: avoid_print, deprecated_member_use
 
 import 'dart:async';
 import 'dart:html';
diff --git a/pubspec.yaml b/pubspec.yaml
index 77f422b91..e5c9b819a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -32,6 +32,7 @@ dependencies:
   sqflite_common: ^2.4.5
   sqlite3: ^2.1.0
   typed_data: ^1.3.2
+  web: ^1.1.1
   webrtc_interface: ^1.2.2+hotfix.1
 
 dev_dependencies: