diff --git a/lib/src/views/chats/chat_messages_components/chat_reaction_row.dart b/lib/src/views/chats/chat_messages_components/chat_reaction_row.dart
index 769da23..e30f610 100644
--- a/lib/src/views/chats/chat_messages_components/chat_reaction_row.dart
+++ b/lib/src/views/chats/chat_messages_components/chat_reaction_row.dart
@@ -6,8 +6,11 @@ import 'package:twonly/src/database/twonly_database.dart';
 import 'package:twonly/src/model/json/message.dart';
 
 class ReactionRow extends StatefulWidget {
-  const ReactionRow(
-      {super.key, required this.otherReactions, required this.message});
+  const ReactionRow({
+    super.key,
+    required this.otherReactions,
+    required this.message,
+  });
 
   final List<Message> otherReactions;
   final Message message;
diff --git a/lib/src/views/chats/chat_messages_components/message_actions.dart b/lib/src/views/chats/chat_messages_components/message_actions.dart
index 8390c2e..1b2a598 100644
--- a/lib/src/views/chats/chat_messages_components/message_actions.dart
+++ b/lib/src/views/chats/chat_messages_components/message_actions.dart
@@ -140,14 +140,16 @@ class MessageContextMenu extends StatelessWidget {
                   responseToOtherMessageId: (message.messageOtherId == null)
                       ? message.messageId
                       : null),
-              PushNotification(
-                kind: (message.kind == MessageKind.textMessage)
-                    ? PushKind.reactionToText
-                    : (getMediaContent(message)!.isVideo)
-                        ? PushKind.reactionToVideo
-                        : PushKind.reactionToText,
-                reactionContent: layer.text,
-              ),
+              (message.messageOtherId != null)
+                  ? PushNotification(
+                      kind: (message.kind == MessageKind.textMessage)
+                          ? PushKind.reactionToText
+                          : (getMediaContent(message)!.isVideo)
+                              ? PushKind.reactionToVideo
+                              : PushKind.reactionToImage,
+                      reactionContent: layer.text,
+                    )
+                  : null,
             );
           },
           child: const FaIcon(FontAwesomeIcons.faceLaugh),