diff --git a/lib/pages/chat/events/audio_player.dart b/lib/pages/chat/events/audio_player.dart
index 0831047f4..d14a1ab68 100644
--- a/lib/pages/chat/events/audio_player.dart
+++ b/lib/pages/chat/events/audio_player.dart
@@ -164,6 +164,14 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
   }
 
   void _onButtonTap() async {
+    // #Pangea
+    // https://github.com/pangeachat/client/issues/3458
+    if (widget.event != null && !widget.event!.status.isSent) {
+      widget.chatController.showToolbar(widget.event!);
+      return;
+    }
+    // Pangea#
+
     WidgetsBinding.instance.addPostFrameCallback((_) {
       ScaffoldMessenger.of(matrix.context).clearMaterialBanners();
     });
@@ -435,7 +443,10 @@ class AudioPlayerState extends State<AudioPlayerWidget> {
     }
 
     // #Pangea
-    if (widget.autoplay) _onButtonTap();
+    if (widget.autoplay &&
+        (widget.event == null || widget.event!.status.isSent)) {
+      _onButtonTap();
+    }
     // Pangea#
   }
 
diff --git a/lib/pangea/toolbar/widgets/message_selection_positioner.dart b/lib/pangea/toolbar/widgets/message_selection_positioner.dart
index 12c728d48..461d03018 100644
--- a/lib/pangea/toolbar/widgets/message_selection_positioner.dart
+++ b/lib/pangea/toolbar/widgets/message_selection_positioner.dart
@@ -325,7 +325,7 @@ class MessageSelectionPositionerState extends State<MessageSelectionPositioner>
 
   void _onContentSizeChanged(_) {
     Future.delayed(FluffyThemes.animationDuration, () {
-      setState(() {});
+      if (mounted) setState(() {});
     });
   }