diff --git a/Riot/ViewController/HomeViewController.m b/Riot/ViewController/HomeViewController.m
index 1bb6685bd..1570e310b 100644
--- a/Riot/ViewController/HomeViewController.m
+++ b/Riot/ViewController/HomeViewController.m
@@ -240,9 +240,11 @@
 {
     if (self.delegate)
     {
-        id<MXKRecentCellDataStoring> cellData = [recentsDataSource cellDataAtIndexPath:[NSIndexPath indexPathForRow:indexPath.item inSection:collectionView.tag]];
+        RoomCollectionViewCell *roomCollectionViewCell = (RoomCollectionViewCell*)[collectionView cellForItemAtIndexPath:indexPath];
         
-        [self.delegate recentListViewController:self didSelectRoom:cellData.roomSummary.roomId inMatrixSession:cellData.roomSummary.room.mxSession];
+        id<MXKRecentCellDataStoring> renderedCellData = (id<MXKRecentCellDataStoring>)roomCollectionViewCell.renderedCellData;
+        
+        [self.delegate recentListViewController:self didSelectRoom:renderedCellData.roomSummary.roomId inMatrixSession:renderedCellData.roomSummary.room.mxSession];
     }
     
     // Hide the keyboard when user select a room
diff --git a/Riot/Views/RoomList/RoomCollectionViewCell.m b/Riot/Views/RoomList/RoomCollectionViewCell.m
index c22a48ccc..59358e606 100644
--- a/Riot/Views/RoomList/RoomCollectionViewCell.m
+++ b/Riot/Views/RoomList/RoomCollectionViewCell.m
@@ -54,8 +54,6 @@
 - (void)layoutSubviews
 {
     [super layoutSubviews];
-    
-    
 }
 
 - (void)render:(MXKCellData *)cellData
@@ -137,6 +135,11 @@
     }
 }
 
+- (MXKCellData*)renderedCellData
+{
+    return roomCellData;
+}
+
 + (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
 {
     // The height is fixed