diff --git a/lib/pages/chat/events/message.dart b/lib/pages/chat/events/message.dart
index d3ac2306b..6344caa36 100644
--- a/lib/pages/chat/events/message.dart
+++ b/lib/pages/chat/events/message.dart
@@ -606,9 +606,10 @@ class Message extends StatelessWidget {
                                                     // #Pangea
                                                     child: ShimmerBackground(
                                                       enabled: controller
-                                                          .showMessageShimmer(
-                                                        event,
-                                                      ),
+                                                              .showMessageShimmer(
+                                                            event,
+                                                          ) &&
+                                                          isButton,
                                                       // Pangea#
                                                       child: Container(
                                                         decoration: