diff --git a/Riot/Utils/EventFormatter.m b/Riot/Utils/EventFormatter.m
index 9694da434..551e7e797 100644
--- a/Riot/Utils/EventFormatter.m
+++ b/Riot/Utils/EventFormatter.m
@@ -451,11 +451,12 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
         // TODO: Build a complete summary like Riot-web
         
         // bwi #5575 correct texts for collapsed acl events
-        else if (aclEvent || roomMemberEvent)
+        else if (aclEvent || roomMemberEvent || joinRuleEvent)
         {
             CollapsedACLEvents eventsType = [[FederationEventHelper shared]  isCollapsedACLEventsWithEvents:events];
             switch (eventsType) {
                 case CollapsedACLEventsNone:
+                    displayText = [VectorL10n eventFormatterMemberUpdates:events.count];
                     break;
                 case CollapsedACLEventsMixed:
                     displayText = [BWIL10n eventFormatterAclAndOtherCollapsed:events.count];
@@ -463,10 +464,8 @@ static NSString *const kEventFormatterTimeFormat = @"HH:mm";
                 case CollapsedACLEventsAll:
                     displayText =  [BWIL10n eventFormatterAclCollapsed:events.count];
                     break;
-                case CollapsedACLEventsOnlyMember:
-                    displayText = [VectorL10n eventFormatterMemberUpdates:events.count];
-                    break;
                 default:
+                    displayText = [VectorL10n eventFormatterMemberUpdates:events.count];
                     break;
             }
         }
diff --git a/bwi/Federation/FederationEventHelper.swift b/bwi/Federation/FederationEventHelper.swift
index 062334bc1..174282445 100644
--- a/bwi/Federation/FederationEventHelper.swift
+++ b/bwi/Federation/FederationEventHelper.swift
@@ -21,7 +21,6 @@ import Foundation
     case none = 0
     case mixed = 1
     case all = 2
-    case onlyMember = 3
 }
 
 @objc class FederationEventHelper: NSObject {
@@ -59,23 +58,19 @@ import Foundation
     }
     
     @objc func isCollapsedACLEvents( events: [MXEvent]) -> CollapsedACLEvents {
-        var aclEventCount = 0, otherEventCount = 0, memberEventCount = 0
+        var aclEventCount = 0, otherEventCount = 0
         for event in events {
-            if event.eventType == .roomServerACL {
-                aclEventCount += 1
-            } else if event.eventType == .roomMember {
-                memberEventCount += 1
-            } else {
+            if event.eventType != .roomServerACL {
                 otherEventCount += 1
+            } else {
+                aclEventCount += 1
             }
         }
         
-        if aclEventCount > 0 && otherEventCount == 0 && memberEventCount == 0 {
+        if aclEventCount > 0 && otherEventCount == 0 {
             return .all
-        } else if otherEventCount > 0 && aclEventCount == 0 && memberEventCount == 0 {
+        } else if otherEventCount > 0 && aclEventCount == 0 {
             return .none
-        } else if memberEventCount > 0 && otherEventCount == 0 && aclEventCount == 0 {
-            return .onlyMember
         } else {
             return .mixed
         }