diff --git a/lib/components/avatar.dart b/lib/components/avatar.dart
index 5731471..3f49e89 100644
--- a/lib/components/avatar.dart
+++ b/lib/components/avatar.dart
@@ -42,7 +42,7 @@ class Avatar extends StatelessWidget {
         backgroundImage: mxContent.mxc?.isNotEmpty ?? false
             ? AdvancedNetworkImage(
                 src,
-                useDiskCache: true,
+                useDiskCache: !kIsWeb,
               )
             : null,
         backgroundColor: mxContent.mxc.isEmpty
diff --git a/lib/components/content_banner.dart b/lib/components/content_banner.dart
index 151a6cb..e77176b 100644
--- a/lib/components/content_banner.dart
+++ b/lib/components/content_banner.dart
@@ -53,7 +53,7 @@ class ContentBanner extends StatelessWidget {
                           fit: BoxFit.cover,
                           image: AdvancedNetworkImage(
                             src,
-                            useDiskCache: true,
+                            useDiskCache: !kIsWeb,
                           ),
                         )
                       : Icon(defaultIcon, size: 300)
diff --git a/lib/utils/matrix_file_extension.dart b/lib/utils/matrix_file_extension.dart
index 78ea6e9..0273074 100644
--- a/lib/utils/matrix_file_extension.dart
+++ b/lib/utils/matrix_file_extension.dart
@@ -18,7 +18,9 @@ extension MatrixFileExtension on MatrixFile {
       var element = html.document.createElement('a');
       element.setAttribute(
           'href', html.Url.createObjectUrlFromBlob(html.Blob([bytes])));
-      element.setAttribute('target', "new");
+      element.setAttribute('target', "_blank");
+      element.setAttribute('rel', "noopener");
+      element.setAttribute('download', fileName);
       element.setAttribute('type', mimeType);
       element.style.display = 'none';
       html.document.body.append(element);