diff --git a/CHANGES.rst b/CHANGES.rst
index a923de8aa..9761acd5a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,7 @@ Improvements:
  * Context menu polish (#2466).
  * Message Editing: Annotate edited messages in timeline (#2400).
  * Message Editing: Editing in the timeline (#2404).
+ * Read receipts: They are now counted at the MatrixKit level.
 
 Bug fix:
  * Device Verification: Fix user display name and device id colors in dark theme
diff --git a/Riot/Modules/Room/CellData/RoomBubbleCellData.m b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
index e550c3616..bf8ef7909 100644
--- a/Riot/Modules/Room/CellData/RoomBubbleCellData.m
+++ b/Riot/Modules/Room/CellData/RoomBubbleCellData.m
@@ -71,10 +71,6 @@ static NSAttributedString *timestampVerticalWhitespace = nil;
 
         // Increase maximum number of components
         self.maxComponentCount = 20;
-        
-        // Initialize read receipts
-        self.readReceipts = [NSMutableDictionary dictionary];
-        self.readReceipts[event.eventId] = [roomDataSource.room getEventReceipts:event.eventId sorted:YES];
 
         // Reset attributedTextMessage to force reset MXKRoomCellData parameters
         self.attributedTextMessage = nil;
@@ -550,9 +546,6 @@ static NSAttributedString *timestampVerticalWhitespace = nil;
         return NO;
     }
 
-    // Update read receipts for this bubble
-    self.readReceipts[event.eventId] = [roomDataSource.room getEventReceipts:event.eventId sorted:YES];
-
     return [super addEvent:event andRoomState:roomState];
 }