diff --git a/Riot/Modules/Application/LegacyAppDelegate.m b/Riot/Modules/Application/LegacyAppDelegate.m
index 6b9816643..81cbc7ad4 100644
--- a/Riot/Modules/Application/LegacyAppDelegate.m
+++ b/Riot/Modules/Application/LegacyAppDelegate.m
@@ -3405,7 +3405,7 @@ NSString *const AppDelegateUniversalLinkDidChangeNotification = @"AppDelegateUni
                                                      @"party_id": mxSession.myDeviceId
                                                  };
                                                  
-                                                 [mxSession.matrixRestClient sendEventToRoom:event.roomId eventType:kMXEventTypeStringCallReject content:content txnId:nil success:nil failure:^(NSError *error) {
+                                                 [mxSession.matrixRestClient sendEventToRoom:event.roomId threadId:nil eventType:kMXEventTypeStringCallReject content:content txnId:nil success:nil failure:^(NSError *error) {
                                                      MXLogDebug(@"[AppDelegate] enableNoVoIPOnMatrixSession: ERROR: Cannot send m.call.reject event.");
                                                  }];
                                                  
diff --git a/RiotShareExtension/Shared/ShareManager.m b/RiotShareExtension/Shared/ShareManager.m
index fdec722ed..9049e2eff 100644
--- a/RiotShareExtension/Shared/ShareManager.m
+++ b/RiotShareExtension/Shared/ShareManager.m
@@ -724,7 +724,7 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
     dispatch_group_t dispatchGroup = dispatch_group_create();
     for (MXRoom *room in rooms) {
         dispatch_group_enter(dispatchGroup);
-        [room sendTextMessage:text success:^(NSString *eventId) {
+        [room sendTextMessage:text threadId:nil success:^(NSString *eventId) {
             dispatch_group_leave(dispatchGroup);
         } failure:^(NSError *innerError) {
             MXLogError(@"[ShareManager] sendTextMessage failed with error %@", error);
@@ -764,7 +764,7 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
     dispatch_group_t dispatchGroup = dispatch_group_create();
     for (MXRoom *room in rooms) {
         dispatch_group_enter(dispatchGroup);
-        [room sendFile:fileUrl mimeType:mimeType localEcho:nil success:^(NSString *eventId) {
+        [room sendFile:fileUrl mimeType:mimeType threadId:nil localEcho:nil success:^(NSString *eventId) {
             dispatch_group_leave(dispatchGroup);
         } failure:^(NSError *innerError) {
             MXLogError(@"[ShareManager] sendFile failed with error %@", innerError);
@@ -815,7 +815,7 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
         dispatch_group_t dispatchGroup = dispatch_group_create();
         for (MXRoom *room in rooms) {
             dispatch_group_enter(dispatchGroup);
-            [room sendVideoAsset:videoAsset withThumbnail:videoThumbnail localEcho:nil success:^(NSString *eventId) {
+            [room sendVideoAsset:videoAsset withThumbnail:videoThumbnail threadId:nil localEcho:nil success:^(NSString *eventId) {
                 dispatch_group_leave(dispatchGroup);
             } failure:^(NSError *innerError) {
                 MXLogError(@"[ShareManager] Failed sending video with error %@", innerError);
@@ -901,7 +901,7 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
     dispatch_group_t dispatchGroup = dispatch_group_create();
     for (MXRoom *room in rooms) {
         dispatch_group_enter(dispatchGroup);
-        [room sendVoiceMessage:fileUrl mimeType:nil duration:0.0 samples:nil localEcho:nil success:^(NSString *eventId) {
+        [room sendVoiceMessage:fileUrl mimeType:nil duration:0.0 samples:nil threadId:nil localEcho:nil success:^(NSString *eventId) {
             dispatch_group_leave(dispatchGroup);
         } failure:^(NSError *innerError) {
             MXLogError(@"[ShareManager] sendVoiceMessage failed with error %@", error);
@@ -1066,7 +1066,7 @@ typedef NS_ENUM(NSInteger, ImageCompressionMode)
         }
         
         dispatch_group_enter(dispatchGroup);
-        [room sendImage:finalImageData withImageSize:imageSize mimeType:mimeType andThumbnail:thumbnail localEcho:nil success:^(NSString *eventId) {
+        [room sendImage:finalImageData withImageSize:imageSize mimeType:mimeType andThumbnail:thumbnail threadId:nil localEcho:nil success:^(NSString *eventId) {
             dispatch_group_leave(dispatchGroup);
         } failure:^(NSError *innerError) {
             MXLogError(@"[ShareManager] sendImage failed with error %@", error);
diff --git a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
index a749cde50..07d7dc615 100644
--- a/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
+++ b/RiotSwiftUI/Modules/Template/TemplateAdvancedRoomsExample/TemplateRoomChat/Service/MatrixSDK/TemplateRoomChatService.swift
@@ -57,7 +57,7 @@ class TemplateRoomChatService: TemplateRoomChatServiceProtocol {
     // MARK: Public
     func send(textMessage: String) {
         var localEcho: MXEvent? = nil
-        room.sendTextMessage(textMessage, localEcho: &localEcho, completion: { _ in })
+        room.sendTextMessage(textMessage, threadId: nil, localEcho: &localEcho, completion: { _ in })
     }
     
     // MARK: Private
diff --git a/SiriIntents/IntentHandler.m b/SiriIntents/IntentHandler.m
index c55a5357e..5ba8a7a67 100644
--- a/SiriIntents/IntentHandler.m
+++ b/SiriIntents/IntentHandler.m
@@ -245,6 +245,7 @@
                                             session.crypto.warnOnUnknowDevices = NO;
 
                                             [room sendTextMessage:intent.content
+                                                         threadId:nil
                                                           success:^(NSString *eventId) {
                                                               completeWithCode(INSendMessageIntentResponseCodeSuccess);
                                                           } failure:^(NSError *error) {
@@ -259,6 +260,7 @@
                                     }
             
                                     [account.mxRestClient sendTextMessageToRoom:roomID
+                                                                       threadId:nil
                                                                            text:intent.content
                                                                         success:^(NSString *eventId) {
                                                                             completeWithCode(INSendMessageIntentResponseCodeSuccess);