diff --git a/FirebasePushNotifications/index.js b/FirebasePushNotifications/index.js
index 798d4f5c6..bfe2f2812 100644
--- a/FirebasePushNotifications/index.js
+++ b/FirebasePushNotifications/index.js
@@ -168,6 +168,7 @@ exports.pushToChannels = functions.https.onCall((data, context) => {
 
     let type = data.type;
     let senderId = String(data.senderId);
+    let senderName = data.senderName ? data.senderName : 'You received a message';
     let threadId = String(data.threadId);
 
     let userIds = data.userIds;
@@ -187,8 +188,7 @@ exports.pushToChannels = functions.https.onCall((data, context) => {
     var status = {};
     for(let uid in userIds) {
         if(userIds.hasOwnProperty(uid)) {
-            let userName = userIds[uid];
-            let message = buildMessage(userName, body, action, sound, type, senderId, threadId, uid);
+            let message = buildMessage(senderName, body, action, sound, type, senderId, threadId, uid);
             status[uid] = message;
             admin.messaging().send(message);
         }
@@ -203,7 +203,6 @@ exports.pushListener = functions.database.ref('{rootPath}/threads/{threadId}/mes
 
     let messageValue = messageSnapshot.val();
     let senderId = messageValue["user-firebase-id"];
-
     let pushRef = admin.database().ref(context.params.rootPath).child("push-test");
 
     let threadId = context.params.threadId;
@@ -232,4 +231,4 @@ exports.pushListener = functions.database.ref('{rootPath}/threads/{threadId}/mes
         });
     });
 
-});
\ No newline at end of file
+});
diff --git a/chat-sdk-firebase-push/src/main/java/co/chatsdk/firebase/push/FirebasePushHandler.java b/chat-sdk-firebase-push/src/main/java/co/chatsdk/firebase/push/FirebasePushHandler.java
index 39aee521f..0930c60e7 100644
--- a/chat-sdk-firebase-push/src/main/java/co/chatsdk/firebase/push/FirebasePushHandler.java
+++ b/chat-sdk-firebase-push/src/main/java/co/chatsdk/firebase/push/FirebasePushHandler.java
@@ -67,6 +67,7 @@ public void pushForMessage (Message message) {
         data.put("userIds", users);
         data.put("body", body);
         data.put("type", message.getType());
+        data.put("senderName", message.getSender().getName());
         data.put("senderId", message.getSender().getEntityID());
         data.put("threadId", message.getThread().getEntityID());
         data.put("action", ChatSDK.config().pushNotificationAction != null ? ChatSDK.config().pushNotificationAction : QuickReplyNotificationCategory);