diff --git a/src/main/java/gg/agit/konect/domain/chat/group/service/GroupChatService.java b/src/main/java/gg/agit/konect/domain/chat/group/service/GroupChatService.java
index a4714a9c0..85f4f0252 100644
--- a/src/main/java/gg/agit/konect/domain/chat/group/service/GroupChatService.java
+++ b/src/main/java/gg/agit/konect/domain/chat/group/service/GroupChatService.java
@@ -158,6 +158,7 @@ public GroupChatMessageResponse sendMessage(Integer clubId, Integer userId, Stri
         Integer messageId = message.getId();
         Integer senderId = sender.getId();
         String senderName = sender.getName();
+        String clubName = room.getClub().getName();
         String messageContent = message.getContent();
         LocalDateTime createdAt = message.getCreatedAt();
 
@@ -170,6 +171,7 @@ public GroupChatMessageResponse sendMessage(Integer clubId, Integer userId, Stri
         notificationService.sendGroupChatNotification(
             roomId,
             senderId,
+            clubName,
             senderName,
             messageContent,
             filteredRecipients
diff --git a/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java b/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java
index d24effaa1..b5eec80c1 100644
--- a/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java
+++ b/src/main/java/gg/agit/konect/domain/notification/service/NotificationService.java
@@ -131,7 +131,7 @@ public void sendChatNotification(Integer receiverId, Integer roomId, String send
 
             String truncatedBody = buildPreview(messageContent);
             Map<String, Object> data = new HashMap<>();
-            data.put("path", "chats/rooms/" + roomId + "?type=DIRECT");
+            data.put("path", "chats/rooms/" + roomId);
 
             List<ExpoPushMessage> messages = tokens.stream()
                 .map(token -> new ExpoPushMessage(token, senderName, truncatedBody, data))
@@ -197,6 +197,7 @@ public void sendChatNotification(Integer receiverId, Integer roomId, String send
     public void sendGroupChatNotification(
         Integer roomId,
         Integer senderId,
+        String clubName,
         String senderName,
         String messageContent,
         List<Integer> recipientUserIds
@@ -213,8 +214,9 @@ public void sendGroupChatNotification(
             }
 
             String truncatedBody = buildPreview(messageContent);
+            String previewBody = senderName + ": " + truncatedBody;
             Map<String, Object> data = new HashMap<>();
-            data.put("path", "chats/rooms/" + roomId + "?type=GROUP");
+            data.put("path", "chats/rooms/" + roomId);
 
             for (Integer recipientId : filteredRecipients) {
                 try {
@@ -235,7 +237,7 @@ public void sendGroupChatNotification(
                     }
 
                     List<ExpoPushMessage> messages = tokens.stream()
-                        .map(token -> new ExpoPushMessage(token, senderName, truncatedBody, data))
+                        .map(token -> new ExpoPushMessage(token, clubName, previewBody, data))
                         .toList();
 
                     HttpHeaders headers = new HttpHeaders();