diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 18a21f926..045344fcf 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -2010,6 +2010,7 @@ class ChatController extends State<ChatPageWithRoom>
 
   bool showMessageShimmer(Event event) {
     if (event.type != EventTypes.Message) return false;
+    if (!(event.eventId == buttonEventID)) return false;
     if (event.messageType == MessageTypes.Text) {
       return !InstructionsEnum.clickTextMessages.isToggledOff;
     }
diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index 6344caa36..d3ac2306b 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -606,10 +606,9 @@ class Message extends StatelessWidget {
                                                     // #Pangea
                                                     child: ShimmerBackground(
                                                       enabled: controller
-                                                              .showMessageShimmer(
-                                                            event,
-                                                          ) &&
-                                                          isButton,
+                                                          .showMessageShimmer(
+                                                        event,
+                                                      ),
                                                       // Pangea#
                                                       child: Container(
                                                         decoration: