diff --git a/app/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt b/app/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
index bf891abf98..624693ca98 100644
--- a/app/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
+++ b/app/src/main/java/org/session/libsession/messaging/sending_receiving/ReceivedMessageHandler.kt
@@ -414,8 +414,10 @@ class ReceivedMessageHandler @Inject constructor(
                 runThreadUpdate = runThreadUpdate
             ) ?: return null
 
-            // If we have previously "hidden" the sender, we should flip the flag back to visible
-            if (senderAddress is Address.Standard && senderAddress.address != userPublicKey) {
+            // If we have previously "hidden" the sender, we should flip the flag back to visible,
+            // and this should only be done only for 1:1 messages
+            if (senderAddress is Address.Standard && senderAddress.address != userPublicKey
+                && context.threadAddress is Address.Standard) {
                 val existingContact =
                     configFactory.withUserConfigs { it.contacts.get(senderAddress.accountId.hexString) }
 
diff --git a/app/src/main/java/org/session/libsession/messaging/sending_receiving/VisibleMessageHandler.kt b/app/src/main/java/org/session/libsession/messaging/sending_receiving/VisibleMessageHandler.kt
index 06f9213bf0..a5e1332f5e 100644
--- a/app/src/main/java/org/session/libsession/messaging/sending_receiving/VisibleMessageHandler.kt
+++ b/app/src/main/java/org/session/libsession/messaging/sending_receiving/VisibleMessageHandler.kt
@@ -172,8 +172,11 @@ class VisibleMessageHandler @Inject constructor(
                 runThreadUpdate = runThreadUpdate
             ) ?: return null
 
-            // If we have previously "hidden" the sender, we should flip the flag back to visible
-            if (senderAddress is Address.Standard && senderAddress.address != ctx.currentUserPublicKey) {
+            // If we have previously "hidden" the sender, we should flip the flag back to visible,
+            // and this should only be done only for 1:1 messages
+            if (senderAddress is Address.Standard &&
+                senderAddress.address != ctx.currentUserPublicKey &&
+                threadAddress is Address.Standard) {
                 val existingContact =
                     configFactory.withUserConfigs { it.contacts.get(senderAddress.accountId.hexString) }