diff --git a/lib/pangea/choreographer/widgets/has_error_button.dart b/lib/pangea/choreographer/widgets/has_error_button.dart
index 007820139..77a7170d9 100644
--- a/lib/pangea/choreographer/widgets/has_error_button.dart
+++ b/lib/pangea/choreographer/widgets/has_error_button.dart
@@ -1,15 +1,15 @@
+import 'package:fluffychat/pangea/choreographer/controllers/choreographer.dart';
 import 'package:flutter/material.dart';
 
-import '../../controllers/pangea_controller.dart';
 import '../controllers/error_service.dart';
 
 class ChoreographerHasErrorButton extends StatelessWidget {
   final ChoreoError error;
-  final PangeaController pangeaController;
+  final Choreographer choreographer;
 
   const ChoreographerHasErrorButton(
-    this.pangeaController,
-    this.error, {
+    this.error,
+    this.choreographer, {
     super.key,
   });
 
@@ -26,6 +26,7 @@ class ChoreographerHasErrorButton extends StatelessWidget {
               ),
             ),
           );
+          choreographer.errorService.resetError();
         }
       },
       mini: true,
diff --git a/lib/pangea/widgets/chat/chat_floating_action_button.dart b/lib/pangea/widgets/chat/chat_floating_action_button.dart
index 35ea1c3eb..ce4128700 100644
--- a/lib/pangea/widgets/chat/chat_floating_action_button.dart
+++ b/lib/pangea/widgets/chat/chat_floating_action_button.dart
@@ -76,8 +76,8 @@ class ChatFloatingActionButtonState extends State<ChatFloatingActionButton> {
     }
     if (widget.controller.choreographer.errorService.error != null) {
       return ChoreographerHasErrorButton(
-        widget.controller.pangeaController,
         widget.controller.choreographer.errorService.error!,
+        widget.controller.choreographer,
       );
     }
 
diff --git a/lib/pangea/widgets/chat/message_selection_overlay.dart b/lib/pangea/widgets/chat/message_selection_overlay.dart
index 299029a10..4c5cf86da 100644
--- a/lib/pangea/widgets/chat/message_selection_overlay.dart
+++ b/lib/pangea/widgets/chat/message_selection_overlay.dart
@@ -395,6 +395,10 @@ class MessageOverlayController extends State<MessageSelectionOverlay>
   }
 
   Size? get messageSize {
+    if (messageRenderBox == null || !messageRenderBox!.hasSize) {
+      return null;
+    }
+
     try {
       return messageRenderBox?.size;
     } catch (e, s) {
@@ -404,6 +408,10 @@ class MessageOverlayController extends State<MessageSelectionOverlay>
   }
 
   Offset? get messageOffset {
+    if (messageRenderBox == null || !messageRenderBox!.hasSize) {
+      return null;
+    }
+
     try {
       return messageRenderBox?.localToGlobal(Offset.zero);
     } catch (e, s) {