diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
index 917a91f77..34e335387 100644
--- a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
@@ -2365,7 +2365,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
             MXKRoomBubbleCellData *cellData = [self cellDataOfEventWithEventId:eventId];
             if (cellData)
             {
-                if (readThreadIds[i] == [NSNull null])
+                if ([readThreadIds[i] isEqualToString:kMXEventUnthreaded])
                 {
                     // Unthreaded RR must be propagated through all threads.
                     [self.mxSession.threadingService allThreadsInRoomWithId:self.roomId onlyParticipated:NO completion:^(NSArray<id<MXThreadProtocol>> *threads) {
diff --git a/Riot/Modules/Room/DataSources/ThreadDataSource.swift b/Riot/Modules/Room/DataSources/ThreadDataSource.swift
index 266ea6d6e..603ae8862 100644
--- a/Riot/Modules/Room/DataSources/ThreadDataSource.swift
+++ b/Riot/Modules/Room/DataSources/ThreadDataSource.swift
@@ -27,6 +27,8 @@ public class ThreadDataSource: RoomDataSource {
     
     public override func finalizeInitialization() {
         super.finalizeInitialization()
+        showReadMarker = true
+        showBubbleReceipts = true
         showTypingRow = false
 
         NotificationCenter.default.addObserver(self,
@@ -40,22 +42,6 @@ public class ThreadDataSource: RoomDataSource {
                                                object: nil)
     }
     
-    public override var showReadMarker: Bool {
-        get {
-            return true
-        } set {
-            _ = newValue
-        }
-    }
-    
-    public override var showBubbleReceipts: Bool {
-        get {
-            return true
-        } set {
-            _ = newValue
-        }
-    }
-
     public override class func load(withRoomId roomId: String!,
                                     initialEventId: String!,
                                     threadId: String!,