diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
index 9d8cd7dbc..e7075f78f 100644
--- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
+++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp
@@ -1012,10 +1012,6 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event)
         tab = messageTabs.value(QString::fromStdString(event.receiver_name()));
     }
     if (!tab) {
-        if (SettingsCache::instance().getIgnoreNonBuddyUserMessages() && !userListManager->isUserBuddy(senderName)) {
-            // When  he is not a buddy and the settings are set to block non friend messages
-            return;
-        }
         const ServerInfo_User *onlineUserInfo = userListManager->getOnlineUser(senderName);
         if (onlineUserInfo) {
             auto userLevel = UserLevelFlags(onlineUserInfo->user_level());
@@ -1023,6 +1019,12 @@ void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event)
                 !userLevel.testFlag(ServerInfo_User::IsRegistered)) {
                 // Flags are additive, so reg/mod/admin are all IsRegistered
                 return;
+            } else if (SettingsCache::instance().getIgnoreNonBuddyUserMessages() &&
+                       !userListManager->isUserBuddy(senderName) && !userLevel.testFlag(ServerInfo_User::IsModerator) &&
+                       !userLevel.testFlag(ServerInfo_User::IsAdmin)) {
+                // Ignore private messages from non-buddies
+                // Moderator/Admin messages are exempt to ensure warnings reach users
+                return;
             }
         }
         tab = addMessageTab(QString::fromStdString(event.sender_name()), false);