diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index 373689043..472ef4eb4 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -167,9 +167,10 @@ class Message extends StatelessWidget {
     // #Pangea
     ToolbarDisplayController? toolbarController;
     if (event.type == EventTypes.Message &&
-            event.messageType == MessageTypes.Text ||
-        event.messageType == MessageTypes.Notice ||
-        event.messageType == MessageTypes.Audio) {
+        !event.redacted &&
+        (event.messageType == MessageTypes.Text ||
+            event.messageType == MessageTypes.Notice ||
+            event.messageType == MessageTypes.Audio)) {
       toolbarController = controller.getToolbarDisplayController(
         event.eventId,
         nextEvent: nextEvent,
diff --git a/lib/pangea/pages/settings_learning/settings_learning_view.dart b/lib/pangea/pages/settings_learning/settings_learning_view.dart
index 125b2ac99..d878dcb42 100644
--- a/lib/pangea/pages/settings_learning/settings_learning_view.dart
+++ b/lib/pangea/pages/settings_learning/settings_learning_view.dart
@@ -65,7 +65,7 @@ class SettingsLearningView extends StatelessWidget {
                 defaultValue: controller.pangeaController.pStoreService.read(
                       PLocalKey.autoPlayMessages,
                     ) ??
-                    true,
+                    false,
                 title: L10n.of(context)!.autoPlayTitle,
                 subtitle: L10n.of(context)!.autoPlayDesc,
                 pStoreKey: PLocalKey.autoPlayMessages,