diff --git a/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.m
index 55781b106..5744e75ed 100644
--- a/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.m
+++ b/Riot/Modules/MatrixKit/Controllers/MXKCallViewController.m
@@ -1197,7 +1197,7 @@ static const CGFloat kLocalPreviewMargin = 20;
     if (roomListener && mxCall.room)
     {
         MXWeakify(self);
-        [mxCall.room liveTimeline:^(MXEventTimeline *liveTimeline) {
+        [mxCall.room liveTimeline:^(id<MXEventTimeline> liveTimeline) {
             MXStrongifyAndReturnIfNil(self);
 
             [liveTimeline removeListener:self->roomListener];
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.h b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.h
index 6724f6998..269c279e1 100644
--- a/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.h
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.h
@@ -117,7 +117,7 @@ typedef enum : NSUInteger
  */
 @property (nonatomic, readonly) MXRoomMember *mxRoomMember;
 @property (nonatomic, readonly) MXRoom *mxRoom;
-@property (nonatomic, readonly) MXEventTimeline *mxRoomLiveTimeline;
+@property (nonatomic, readonly) id<MXEventTimeline> mxRoomLiveTimeline;
 
 /**
  Enable mention option. NO by default
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.m
index 67623bc18..67b963119 100644
--- a/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.m
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomMemberDetailsViewController.m
@@ -44,7 +44,7 @@
     id roomDidFlushDataNotificationObserver;
 
     // Cache for the room live timeline
-    MXEventTimeline *mxRoomLiveTimeline;
+    id<MXEventTimeline> mxRoomLiveTimeline;
 }
 
 @end
@@ -134,7 +134,7 @@
     mxRoom = room;
 
     MXWeakify(self);
-    [mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+    [mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
         MXStrongifyAndReturnIfNil(self);
 
         self->mxRoomLiveTimeline = liveTimeline;
@@ -152,7 +152,7 @@
     }];
 }
 
-- (MXEventTimeline *)mxRoomLiveTimeline
+- (id<MXEventTimeline> )mxRoomLiveTimeline
 {
     // @TODO(async-state): Just here for dev
     NSAssert(mxRoomLiveTimeline, @"[MXKRoomMemberDetailsViewController] Room live timeline must be preloaded before accessing to MXKRoomMemberDetailsViewController.mxRoomLiveTimeline");
@@ -569,7 +569,7 @@
     if (membersListener && mxRoom)
     {
         MXWeakify(self);
-        [mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+        [mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
             MXStrongifyAndReturnIfNil(self);
 
             [liveTimeline removeListener:self->membersListener];
diff --git a/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.m b/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.m
index 8f729e9b9..af99a7e3f 100644
--- a/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.m
+++ b/Riot/Modules/MatrixKit/Controllers/MXKRoomSettingsViewController.m
@@ -70,7 +70,7 @@
     if (roomListener)
     {
         MXWeakify(self);
-        [mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+        [mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
             MXStrongifyAndReturnIfNil(self);
 
             [liveTimeline removeListener:self->roomListener];
@@ -139,7 +139,7 @@
     {
         // Register a listener to handle messages related to room name, topic...
         MXWeakify(self);
-        [mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+        [mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
             MXStrongifyAndReturnIfNil(self);
 
             self->roomListener = [liveTimeline listenToEventsOfTypes:@[kMXEventTypeStringRoomName, kMXEventTypeStringRoomTopic, kMXEventTypeStringRoomAliases, kMXEventTypeStringRoomAvatar, kMXEventTypeStringRoomPowerLevels, kMXEventTypeStringRoomCanonicalAlias, kMXEventTypeStringRoomJoinRules, kMXEventTypeStringRoomGuestAccess, kMXEventTypeStringRoomHistoryVisibility] onEvent:^(MXEvent *event, MXTimelineDirection direction, MXRoomState *roomState) {
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h
index 5b7182f78..b56eeb8f7 100644
--- a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.h
@@ -138,7 +138,7 @@ extern NSString *const kMXKRoomDataSourceTimelineErrorErrorKey;
  The timeline being managed. It can be the live timeline of the room
  or a timeline from a past event, initialEventId.
  */
-@property (nonatomic, readonly) MXEventTimeline *timeline;
+@property (nonatomic, readonly) id<MXEventTimeline> timeline;
 
 /**
  Flag indicating if the data source manages, or will manage, a live timeline.
diff --git a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
index 7889f8704..d7854a5cd 100644
--- a/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
+++ b/Riot/Modules/MatrixKit/Models/Room/MXKRoomDataSource.m
@@ -203,7 +203,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
 @property (nonatomic, readwrite) MXRoom *room;
 
 @property (nonatomic, readwrite) MXRoom *secondaryRoom;
-@property (nonatomic, strong) MXEventTimeline *secondaryTimeline;
+@property (nonatomic, strong) id<MXEventTimeline> secondaryTimeline;
 @property (nonatomic, readwrite) NSString *threadId;
 
 @end
@@ -258,7 +258,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
 
         // Asynchronously preload data here so that the data will be ready later
         // to synchronously respond to that request
-        [roomDataSource.room liveTimeline:^(MXEventTimeline *liveTimeline) {
+        [roomDataSource.room liveTimeline:^(id<MXEventTimeline> liveTimeline) {
             onComplete(roomDataSource);
         }];
     }
@@ -642,7 +642,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
                 {
                     // LIVE
                     MXWeakify(self);
-                    [_room liveTimeline:^(MXEventTimeline *liveTimeline) {
+                    [_room liveTimeline:^(id<MXEventTimeline> liveTimeline) {
                         MXStrongifyAndReturnIfNil(self);
 
                         self->_timeline = liveTimeline;
@@ -704,7 +704,7 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
                         if (_secondaryRoom)
                         {
                             MXWeakify(self);
-                            [_secondaryRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+                            [_secondaryRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
                                 MXStrongifyAndReturnIfNil(self);
 
                                 self->_secondaryTimeline = liveTimeline;
@@ -1458,7 +1458,6 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
     paginationRequest = [_timeline paginate:numItems
                                   direction:direction
                               onlyFromStore:onlyFromStore
-                                   threadId:_threadId
                                    complete:^{
         
         MXStrongifyAndReturnIfNil(self);
@@ -1526,7 +1525,6 @@ typedef NS_ENUM (NSUInteger, MXKRoomDataSourceError) {
         secondaryPaginationRequest = [_secondaryTimeline paginate:numItems
                                                         direction:direction
                                                     onlyFromStore:onlyFromStore
-                                                         threadId:_threadId
                                                          complete:^{
             
             MXStrongifyAndReturnIfNil(self);
diff --git a/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberListDataSource.m b/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberListDataSource.m
index ab8b879ae..87ffcb608 100644
--- a/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberListDataSource.m
+++ b/Riot/Modules/MatrixKit/Models/RoomMemberList/MXKRoomMemberListDataSource.m
@@ -85,7 +85,7 @@ NSString *const kMXKRoomMemberCellIdentifier = @"kMXKRoomMemberCellIdentifier";
     if (typingNotifListener)
     {
         MXWeakify(self);
-        [mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+        [mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
             MXStrongifyAndReturnIfNil(self);
 
             [liveTimeline removeListener:self->typingNotifListener];
diff --git a/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.m b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.m
index 9fbe1dec9..c568f7eff 100644
--- a/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.m
+++ b/Riot/Modules/MatrixKit/Views/RoomTitle/MXKRoomTitleViewWithTopic.m
@@ -115,7 +115,7 @@
             if (self->roomTopicListener && self.mxRoom)
             {
                 MXWeakify(self);
-                [self.mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+                [self.mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
                     MXStrongifyAndReturnIfNil(self);
 
                     [liveTimeline removeListener:self->roomTopicListener];
diff --git a/Riot/Modules/Room/Members/RoomParticipantsViewController.m b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
index 1776b8775..2d7e3426a 100644
--- a/Riot/Modules/Room/Members/RoomParticipantsViewController.m
+++ b/Riot/Modules/Room/Members/RoomParticipantsViewController.m
@@ -214,7 +214,7 @@
     if (membersListener)
     {
         MXWeakify(self);
-        [self.mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+        [self.mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
             MXStrongifyAndReturnIfNil(self);
 
             [liveTimeline removeListener:self->membersListener];
@@ -328,7 +328,7 @@
             if (self->membersListener)
             {
                 MXWeakify(self);
-                [self.mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+                [self.mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
                     MXStrongifyAndReturnIfNil(self);
 
                     [liveTimeline removeListener:self->membersListener];
@@ -394,7 +394,7 @@
             NSArray *mxMembersEvents = @[kMXEventTypeStringRoomMember, kMXEventTypeStringRoomThirdPartyInvite, kMXEventTypeStringRoomPowerLevels];
 
             MXWeakify(self);
-            [self.mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+            [self.mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
                 MXStrongifyAndReturnIfNil(self);
 
                 self->membersListener = [liveTimeline listenToEventsOfTypes:mxMembersEvents onEvent:^(MXEvent *event, MXTimelineDirection direction, id customObject) {
diff --git a/Riot/Modules/Room/RoomViewController.m b/Riot/Modules/Room/RoomViewController.m
index dea83ee5e..95c49db3b 100644
--- a/Riot/Modules/Room/RoomViewController.m
+++ b/Riot/Modules/Room/RoomViewController.m
@@ -4779,7 +4779,7 @@ const NSTimeInterval kResizeComposerAnimationDuration = .05;
         if (typingNotifListener)
         {
             MXWeakify(self);
-            [self.roomDataSource.room liveTimeline:^(MXEventTimeline *liveTimeline) {
+            [self.roomDataSource.room liveTimeline:^(id<MXEventTimeline> liveTimeline) {
                 MXStrongifyAndReturnIfNil(self);
                 
                 [liveTimeline removeListener:self->typingNotifListener];
diff --git a/Riot/Modules/Room/Settings/RoomSettingsViewController.m b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
index 7ca017b57..9980e50df 100644
--- a/Riot/Modules/Room/Settings/RoomSettingsViewController.m
+++ b/Riot/Modules/Room/Settings/RoomSettingsViewController.m
@@ -424,7 +424,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
     if (extraEventsListener)
     {
         MXWeakify(self);
-        [mxRoom liveTimeline:^(MXEventTimeline *liveTimeline) {
+        [mxRoom liveTimeline:^(id<MXEventTimeline> liveTimeline) {
             MXStrongifyAndReturnIfNil(self);
 
             [liveTimeline removeListener:self->extraEventsListener];
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
index 79bed75b1..07d7dc615 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
@@ -80,7 +80,7 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
                 }
                 
             })
-            timeline.paginate(200, direction: .backwards, onlyFromStore: false, threadId: nil) { result in
+            timeline.paginate(200, direction: .backwards, onlyFromStore: false) { result in
                 guard result.isSuccess else {
                     self.roomInitializationStatus.value = .failedToInitialize
                     return