diff --git a/app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.java b/app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.java
index 32d66efb..c1cb2304 100644
--- a/app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.java
+++ b/app/src/main/java/com/keylesspalace/tusky/viewdata/NotificationViewData.java
@@ -102,7 +102,7 @@ public abstract class NotificationViewData {
                     type == concrete.type &&
                     Objects.equals(id, concrete.id) &&
                     account.getId().equals(concrete.account.getId()) &&
-                    emoji.equals(concrete.emoji) &&
+                    (emoji != null && concrete.emoji != null && emoji.equals(concrete.emoji)) &&
                     (statusViewData == concrete.statusViewData ||
                             statusViewData != null &&
                                     statusViewData.deepEquals(concrete.statusViewData));