diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java
index c6988743d..f59d2a8fe 100644
--- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java
+++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationJob.java
@@ -187,7 +187,7 @@ public class NotificationJob extends Job {
                                     // do absolutely nothing, we won't even come to this point
                                     break;
                                 case "chat":
-                                    if (decryptedPushMessage.getNotificationId() != null) {
+                                    if (decryptedPushMessage.getNotificationId() != Long.MIN_VALUE) {
                                         showMessageNotificationWithObjectData(intent);
                                     } else {
                                         showNotification(intent);
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java
index 5884a9c8b..3b077d8bd 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/push/DecryptedPushMessage.java
@@ -45,7 +45,7 @@ public class DecryptedPushMessage {
     String id;
 
     @JsonField(name = "nid")
-    Long notificationId;
+    long notificationId;
 
     @JsonIgnore
     String text;