diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index 086b5fbbf..c5756438c 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -587,7 +587,8 @@ class Message extends StatelessWidget {
                           ? MainAxisAlignment.end
                           : MainAxisAlignment.start,
                       children: [
-                        MessageButtons(toolbarController: toolbarController),
+                        if (pangeaMessageEvent?.showMessageButtons ?? false)
+                          MessageButtons(toolbarController: toolbarController),
                         MessageReactions(event, timeline),
                       ],
                     ),