diff --git a/Riot/Model/Room/RoomBubbleCellData.m b/Riot/Model/Room/RoomBubbleCellData.m
index d8dd8c664..874a2e51b 100644
--- a/Riot/Model/Room/RoomBubbleCellData.m
+++ b/Riot/Model/Room/RoomBubbleCellData.m
@@ -110,6 +110,19 @@ static NSAttributedString *readReceiptVerticalWhitespace = nil;
     return attributedTextMessage;
 }
 
+#pragma mark - Bubble collapsing
+
+- (BOOL)collaspseWith:(id<MXKRoomBubbleCellDataStoring>)cellData
+{
+    if (self.tag == RoomBubbleCellDataTagMembership
+        && cellData.tag == RoomBubbleCellDataTagMembership)
+    {
+        return YES;
+    }
+    
+    return [super collaspseWith:cellData];
+}
+
 #pragma mark - 
 
 - (NSAttributedString*)refreshAttributedTextMessage