diff --git a/RiotShareExtension/Shared/ForwardingShareItemSender.swift b/RiotShareExtension/Shared/ForwardingShareItemSender.swift
index 84b866b27..3909812db 100644
--- a/RiotShareExtension/Shared/ForwardingShareItemSender.swift
+++ b/RiotShareExtension/Shared/ForwardingShareItemSender.swift
@@ -51,7 +51,7 @@ class ForwardingShareItemSender: NSObject, ShareItemSenderProtocol {
             dispatchGroup.enter()
             
             var localEcho: MXEvent?
-            room.sendMessage(withContent: event.content, localEcho: &localEcho) { result in
+            room.sendMessage(withContent: event.content, threadId: nil, localEcho: &localEcho) { result in
                 switch result {
                 case .failure(let innerError):
                     errors.append(innerError)
diff --git a/RiotShareExtension/Sources/ShareItemSender.m b/RiotShareExtension/Sources/ShareItemSender.m
index e1cd1add6..fdc213033 100644
--- a/RiotShareExtension/Sources/ShareItemSender.m
+++ b/RiotShareExtension/Sources/ShareItemSender.m
@@ -525,7 +525,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(@"[ShareItemSender] sendTextMessage failed with error %@", error);
@@ -565,7 +565,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(@"[ShareItemSender] sendFile failed with error %@", innerError);
@@ -616,7 +616,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);
@@ -702,7 +702,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(@"[ShareItemSender] sendVoiceMessage failed with error %@", error);
@@ -867,7 +867,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);