diff --git a/Riot/Modules/Common/Recents/CellData/RecentCellData.m b/Riot/Modules/Common/Recents/CellData/RecentCellData.m
index a9def48fd..6b691fd28 100644
--- a/Riot/Modules/Common/Recents/CellData/RecentCellData.m
+++ b/Riot/Modules/Common/Recents/CellData/RecentCellData.m
@@ -44,8 +44,9 @@
 
 - (NSUInteger)notificationCount
 {
+    MXRoom *room = [self.mxSession roomWithRoomId:self.roomSummary.roomId];
     // Ignore the regular notification count if the room is in 'mentions only" mode at the Riot level.
-    if (self.roomSummary.room.isMentionsOnly)
+    if (room.isMentionsOnly)
     {
         // Only the highlighted missed messages must be considered here.
         return self.roomSummary.highlightCount;
diff --git a/Riot/Modules/Common/Recents/RecentsViewController.m b/Riot/Modules/Common/Recents/RecentsViewController.m
index 76d54ee95..36b995e2d 100644
--- a/Riot/Modules/Common/Recents/RecentsViewController.m
+++ b/Riot/Modules/Common/Recents/RecentsViewController.m
@@ -894,7 +894,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
 {
     id<MXKRecentCellDataStoring> cellDataStoring = (id<MXKRecentCellDataStoring> )cellData;
     
-    if (cellDataStoring.roomSummary.room.summary.membership != MXMembershipInvite)
+    if (cellDataStoring.roomSummary.membership != MXMembershipInvite)
     {
         return RecentTableViewCell.class;
     }
@@ -1444,9 +1444,8 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
         id<MXKRecentCellDataStoring> cellData = [self.dataSource cellDataAtIndexPath:indexPath];
 
         // Retrieve the invited room
-        MXRoom* invitedRoom = cellData.roomSummary.room;
         
-        if (invitedRoom.summary.roomType == MXRoomTypeSpace)
+        if (cellData.roomSummary.roomType == MXRoomTypeSpace)
         {
             // Indicates that spaces are not supported
             [self showSpaceInviteNotAvailable];
@@ -1455,7 +1454,7 @@ NSString *const RecentsViewControllerDataReadyNotification = @"RecentsViewContro
         else if ([self canShowRoomPreviewFor:cellData.roomSummary])
         {
             // Display the room preview
-            [self dispayRoomWithRoomId:invitedRoom.roomId inMatrixSession:invitedRoom.mxSession];
+            [self dispayRoomWithRoomId:cellData.roomSummary.roomId inMatrixSession:cellData.mxSession];
         }
         else
         {
diff --git a/Riot/Modules/Home/HomeViewController.m b/Riot/Modules/Home/HomeViewController.m
index 21ae2e64c..ea504c2e8 100644
--- a/Riot/Modules/Home/HomeViewController.m
+++ b/Riot/Modules/Home/HomeViewController.m
@@ -562,7 +562,7 @@
         
         id<MXKRecentCellDataStoring> renderedCellData = (id<MXKRecentCellDataStoring>)roomCollectionViewCell.renderedCellData;
         
-        [self.delegate recentListViewController:self didSelectRoom:renderedCellData.roomSummary.roomId inMatrixSession:renderedCellData.roomSummary.room.mxSession];
+        [self.delegate recentListViewController:self didSelectRoom:renderedCellData.roomSummary.roomId inMatrixSession:renderedCellData.mxSession];
     }
     
     // Hide the keyboard when user select a room
diff --git a/Riot/Modules/People/Views/InviteRecentTableViewCell+ButtonViewsUpdate.swift b/Riot/Modules/People/Views/InviteRecentTableViewCell+ButtonViewsUpdate.swift
index 7c5ce4825..27d319da7 100644
--- a/Riot/Modules/People/Views/InviteRecentTableViewCell+ButtonViewsUpdate.swift
+++ b/Riot/Modules/People/Views/InviteRecentTableViewCell+ButtonViewsUpdate.swift
@@ -26,8 +26,8 @@ extension InviteRecentTableViewCell {
     }
     
     /// Update buttons according to current MXMembershipChangeState of the room
-    @objc func updateButtonViews(with room: MXRoom) {
-        let membershipTransitionState = room.summary.membershipTransitionState
+    @objc func updateButtonViews(with summary: MXRoomSummaryProtocol) {
+        let membershipTransitionState = summary.membershipTransitionState
         
         var joinButtonIsLoading = false
         var leaveButtonIsLoading = false
diff --git a/Riot/Modules/People/Views/InviteRecentTableViewCell.m b/Riot/Modules/People/Views/InviteRecentTableViewCell.m
index 796e1d938..9401ab495 100644
--- a/Riot/Modules/People/Views/InviteRecentTableViewCell.m
+++ b/Riot/Modules/People/Views/InviteRecentTableViewCell.m
@@ -87,7 +87,7 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
 {
     if (self.delegate)
     {
-        MXRoom *room = roomCellData.roomSummary.room;
+        MXRoom *room = [roomCellData.mxSession roomWithRoomId:roomCellData.roomSummary.roomId];
         
         if (room)
         {
@@ -99,16 +99,11 @@ NSString *const kInviteRecentTableViewCellRoomKey = @"kInviteRecentTableViewCell
 - (void)render:(MXKCellData *)cellData
 {
     [super render:cellData];
-        
-    MXRoom *room = roomCellData.roomSummary.room;
     
-    if (room.roomId)
-    {
-        [self updateViewsWithRoom:room showPreviewButton:NO];
-    }
+    [self updateViewsWithRoom:roomCellData.roomSummary showPreviewButton:NO];
 }
 
-- (void)updateViewsWithRoom:(MXRoom*)room showPreviewButton:(BOOL)showPreviewButton
+- (void)updateViewsWithRoom:(id<MXRoomSummaryProtocol>)room showPreviewButton:(BOOL)showPreviewButton
 {
     NSString *rightButtonTitle;
     
diff --git a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
index 386d25835..52ed17ee8 100644
--- a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
+++ b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
@@ -70,7 +70,8 @@
     roomCellData = (id<MXKRecentCellDataStoring>)cellData;
     if (roomCellData)
     {
-        [roomCellData.roomSummary setRoomAvatarImageIn:self.avatarImageView];
+        MXRoomSummary *roomSummary = [roomCellData.mxSession roomSummaryWithRoomId:roomCellData.roomSummary.roomId];
+        [roomSummary setRoomAvatarImageIn:self.avatarImageView];
         
         self.roomTitleLabel.text = roomCellData.roomSummary.displayname;
         if (!self.roomTitleLabel.text.length)