diff --git a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageStateHolder.kt b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageStateHolder.kt
index d8966ba4..17c35c2d 100644
--- a/app/src/main/kotlin/com/github/gotify/messages/provider/MessageStateHolder.kt
+++ b/app/src/main/kotlin/com/github/gotify/messages/provider/MessageStateHolder.kt
@@ -121,10 +121,10 @@ internal class MessageStateHolder {
         val allMessages = state(MessageState.ALL_MESSAGES)
         val appMessages = state(message.appid)
 
-        if (allMessages.loaded && allPosition != -1) {
+        if (allMessages.loaded && allPosition != -1 && allMessages.messages.none { it.id == message.id }) {
             allMessages.messages.add(allPosition, message)
         }
-        if (appMessages.loaded && appPosition != -1) {
+        if (appMessages.loaded && appPosition != -1 && appMessages.messages.none { it.id == message.id }) {
             appMessages.messages.add(appPosition, message)
         }
     }