diff --git a/lib/main.dart b/lib/main.dart
index 785ea5edf..d33e62b41 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -15,7 +15,6 @@ import 'package:fluffychat/pangea/common/utils/firebase_analytics.dart';
 import 'package:fluffychat/pangea/learning_settings/utils/p_language_store.dart';
 import 'package:fluffychat/utils/client_manager.dart';
 import 'package:fluffychat/utils/platform_infos.dart';
-import 'package:fluffychat/widgets/error_widget.dart';
 import 'config/setting_keys.dart';
 import 'utils/background_push.dart';
 import 'widgets/fluffy_chat_app.dart';
@@ -102,8 +101,6 @@ Future<void> startGui(List<Client> clients, SharedPreferences store) async {
   await firstClient?.roomsLoading;
   await firstClient?.accountDataLoading;
 
-  ErrorWidget.builder = (details) => FluffyChatErrorWidget(details);
-
   // #Pangea
   // errors seems to happen a lot when users switch better production / staging
   // while testing by accident. If the account is a production account but server is
diff --git a/lib/widgets/mxc_image.dart b/lib/widgets/mxc_image.dart
index a7e57c14b..2b69b3ca9 100644
--- a/lib/widgets/mxc_image.dart
+++ b/lib/widgets/mxc_image.dart
@@ -66,6 +66,7 @@ class _MxcImageState extends State<MxcImage> {
   }
 
   Future<void> _load() async {
+    if (!mounted) return;
     final client =
         widget.client ?? widget.event?.room.client ?? Matrix.of(context).client;
     final uri = widget.uri;