diff --git a/lib/pages/chat/events/audio_player.dart b/lib/pages/chat/events/audio_player.dart
index 66dbe65da..f2edc232f 100644
--- a/lib/pages/chat/events/audio_player.dart
+++ b/lib/pages/chat/events/audio_player.dart
@@ -10,7 +10,6 @@ import 'package:just_audio/just_audio.dart';
 import 'package:matrix/matrix.dart';
 import 'package:opus_caf_converter_dart/opus_caf_converter_dart.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:universal_html/html.dart' as html;
 
 import 'package:fluffychat/config/app_config.dart';
 import 'package:fluffychat/config/themes.dart';
@@ -203,12 +202,12 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
 
     if (file != null) {
       audioPlayer.setFilePath(file.path);
-    } else if (kIsWeb) {
-      final blob = html.Blob([matrixFile.bytes], matrixFile.mimeType);
-      final url = html.Url.createObjectUrlFromBlob(blob);
-      await audioPlayer.setAudioSource(AudioSource.uri(Uri.parse(url)));
     } else {
-      throw Exception('No audio file provided!');
+      await audioPlayer.setAudioSource(
+        AudioSource.uri(
+          Uri.dataFromBytes(matrixFile.bytes, mimeType: matrixFile.mimeType),
+        ),
+      );
     }
 
     audioPlayer.play().onError(
diff --git a/lib/pages/image_viewer/video_player.dart b/lib/pages/image_viewer/video_player.dart
index 2fd5e0c2c..5b0991ea0 100644
--- a/lib/pages/image_viewer/video_player.dart
+++ b/lib/pages/image_viewer/video_player.dart
@@ -6,7 +6,6 @@ import 'package:flutter/material.dart';
 import 'package:chewie/chewie.dart';
 import 'package:matrix/matrix.dart';
 import 'package:path_provider/path_provider.dart';
-import 'package:universal_html/html.dart' as html;
 import 'package:video_player/video_player.dart';
 
 import 'package:fluffychat/utils/localized_exception_extension.dart';
@@ -64,9 +63,9 @@ class EventVideoPlayerState extends State<EventVideoPlayer> {
 
       // Create the VideoPlayerController from the contents of videoFile.
       if (kIsWeb) {
-        final blob = html.Blob([videoFile.bytes], videoFile.mimeType);
-        final networkUri = Uri.parse(html.Url.createObjectUrlFromBlob(blob));
-        videoPlayerController = VideoPlayerController.networkUrl(networkUri);
+        videoPlayerController = VideoPlayerController.networkUrl(
+          Uri.dataFromBytes(videoFile.bytes, mimeType: videoFile.mimeType),
+        );
       } else {
         final tempDir = await getTemporaryDirectory();
         final fileName = Uri.encodeComponent(