diff --git a/src/ui/chatwin.c b/src/ui/chatwin.c
index 22992ecd..ffffb2e1 100644
--- a/src/ui/chatwin.c
+++ b/src/ui/chatwin.c
@@ -292,7 +292,10 @@ chatwin_incoming_msg(ProfChatWin *chatwin, ProfMessage *message, gboolean win_cr
         //1) only send IQ once
         //2) sort incoming messages on timestamp
         //for now if experimental MAM is enabled we dont show no history from sql either
-        if (!prefs_get_boolean(PREF_MAM) && prefs_get_boolean(PREF_CHLOG) && prefs_get_boolean(PREF_HISTORY)) {
+        
+        // MUCPMs also get printed here. In their case we don't save any logs (because nick owners can change) and thus we shouldn't read logs
+        // (and if we do we need to check the resourcepart)
+        if (!prefs_get_boolean(PREF_MAM) && prefs_get_boolean(PREF_CHLOG) && prefs_get_boolean(PREF_HISTORY) && message->type == PROF_MSG_TYPE_CHAT) {
             _chatwin_history(chatwin, chatwin->barejid);
         }