diff --git a/libdino/src/service/notification_events.vala b/libdino/src/service/notification_events.vala
index 8c86f9d4..c0efd7de 100644
--- a/libdino/src/service/notification_events.vala
+++ b/libdino/src/service/notification_events.vala
@@ -44,7 +44,8 @@ public class NotificationEvents : StreamInteractionModule, Object {
     }
 
     private void on_message_received(Entities.Message message, Conversation conversation) {
-        if (!synced_accounts.contains(conversation.account)) {
+        bool is_mam_message = Xep.MessageArchiveManagement.MessageFlag.get_flag(message.stanza) != null;
+        if (!synced_accounts.contains(conversation.account) && is_mam_message) {
             if (!mam_potential_new.has_key(conversation.account)) {
                 mam_potential_new[conversation.account] = new HashMap<Conversation, Entities.Message>(Conversation.hash_func, Conversation.equals_func);
             }