diff --git a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
index 90c691f8b..b53c6afdd 100644
--- a/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
+++ b/android/app/src/main/java/com/mattermost/rnbeta/CustomPushNotification.java
@@ -363,7 +363,12 @@ public class CustomPushNotification extends PushNotification {
             return channelName;
         }
 
-        return message.split(":")[0];
+        String senderName = message.split(":")[0];
+        if (senderName != message) {
+            return senderName;
+        }
+
+        return " ";
     }
 
     private String removeSenderFromMessage(String message) {