diff --git a/ElementX.xcodeproj/project.pbxproj b/ElementX.xcodeproj/project.pbxproj
index 1fb39ca83..72dc41db8 100644
--- a/ElementX.xcodeproj/project.pbxproj
+++ b/ElementX.xcodeproj/project.pbxproj
@@ -9124,7 +9124,7 @@
 			repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
 			requirement = {
 				kind = exactVersion;
-				version = 25.08.05;
+				version = 25.08.12;
 			};
 		};
 		701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {
diff --git a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 6c55dbd25..1f8267214 100644
--- a/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -158,8 +158,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/element-hq/matrix-rust-components-swift",
       "state" : {
-        "revision" : "d8ec6c9ff99c7706f9623bcbf8ea51ef4370f82e",
-        "version" : "25.8.5"
+        "revision" : "439f123dddf836855cfe006f01f6428f25ed847f",
+        "version" : "25.8.12"
       }
     },
     {
diff --git a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
index 7c7eaad53..bd7d9509a 100644
--- a/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
+++ b/ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
@@ -7188,15 +7188,15 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl
 
     //MARK: - threadsEnabled
 
-    var threadsEnabledEnabledUnderlyingCallsCount = 0
-    open var threadsEnabledEnabledCallsCount: Int {
+    var threadsEnabledEnabledThreadSubscriptionsUnderlyingCallsCount = 0
+    open var threadsEnabledEnabledThreadSubscriptionsCallsCount: Int {
         get {
             if Thread.isMainThread {
-                return threadsEnabledEnabledUnderlyingCallsCount
+                return threadsEnabledEnabledThreadSubscriptionsUnderlyingCallsCount
             } else {
                 var returnValue: Int? = nil
                 DispatchQueue.main.sync {
-                    returnValue = threadsEnabledEnabledUnderlyingCallsCount
+                    returnValue = threadsEnabledEnabledThreadSubscriptionsUnderlyingCallsCount
                 }
 
                 return returnValue!
@@ -7204,29 +7204,29 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl
         }
         set {
             if Thread.isMainThread {
-                threadsEnabledEnabledUnderlyingCallsCount = newValue
+                threadsEnabledEnabledThreadSubscriptionsUnderlyingCallsCount = newValue
             } else {
                 DispatchQueue.main.sync {
-                    threadsEnabledEnabledUnderlyingCallsCount = newValue
+                    threadsEnabledEnabledThreadSubscriptionsUnderlyingCallsCount = newValue
                 }
             }
         }
     }
-    open var threadsEnabledEnabledCalled: Bool {
-        return threadsEnabledEnabledCallsCount > 0
+    open var threadsEnabledEnabledThreadSubscriptionsCalled: Bool {
+        return threadsEnabledEnabledThreadSubscriptionsCallsCount > 0
     }
-    open var threadsEnabledEnabledReceivedEnabled: Bool?
-    open var threadsEnabledEnabledReceivedInvocations: [Bool] = []
+    open var threadsEnabledEnabledThreadSubscriptionsReceivedArguments: (enabled: Bool, threadSubscriptions: Bool)?
+    open var threadsEnabledEnabledThreadSubscriptionsReceivedInvocations: [(enabled: Bool, threadSubscriptions: Bool)] = []
 
-    var threadsEnabledEnabledUnderlyingReturnValue: ClientBuilder!
-    open var threadsEnabledEnabledReturnValue: ClientBuilder! {
+    var threadsEnabledEnabledThreadSubscriptionsUnderlyingReturnValue: ClientBuilder!
+    open var threadsEnabledEnabledThreadSubscriptionsReturnValue: ClientBuilder! {
         get {
             if Thread.isMainThread {
-                return threadsEnabledEnabledUnderlyingReturnValue
+                return threadsEnabledEnabledThreadSubscriptionsUnderlyingReturnValue
             } else {
                 var returnValue: ClientBuilder? = nil
                 DispatchQueue.main.sync {
-                    returnValue = threadsEnabledEnabledUnderlyingReturnValue
+                    returnValue = threadsEnabledEnabledThreadSubscriptionsUnderlyingReturnValue
                 }
 
                 return returnValue!
@@ -7234,26 +7234,26 @@ open class ClientBuilderSDKMock: MatrixRustSDK.ClientBuilder, @unchecked Sendabl
         }
         set {
             if Thread.isMainThread {
-                threadsEnabledEnabledUnderlyingReturnValue = newValue
+                threadsEnabledEnabledThreadSubscriptionsUnderlyingReturnValue = newValue
             } else {
                 DispatchQueue.main.sync {
-                    threadsEnabledEnabledUnderlyingReturnValue = newValue
+                    threadsEnabledEnabledThreadSubscriptionsUnderlyingReturnValue = newValue
                 }
             }
         }
     }
-    open var threadsEnabledEnabledClosure: ((Bool) -> ClientBuilder)?
+    open var threadsEnabledEnabledThreadSubscriptionsClosure: ((Bool, Bool) -> ClientBuilder)?
 
-    open override func threadsEnabled(enabled: Bool) -> ClientBuilder {
-        threadsEnabledEnabledCallsCount += 1
-        threadsEnabledEnabledReceivedEnabled = enabled
+    open override func threadsEnabled(enabled: Bool, threadSubscriptions: Bool) -> ClientBuilder {
+        threadsEnabledEnabledThreadSubscriptionsCallsCount += 1
+        threadsEnabledEnabledThreadSubscriptionsReceivedArguments = (enabled: enabled, threadSubscriptions: threadSubscriptions)
         DispatchQueue.main.async {
-            self.threadsEnabledEnabledReceivedInvocations.append(enabled)
+            self.threadsEnabledEnabledThreadSubscriptionsReceivedInvocations.append((enabled: enabled, threadSubscriptions: threadSubscriptions))
         }
-        if let threadsEnabledEnabledClosure = threadsEnabledEnabledClosure {
-            return threadsEnabledEnabledClosure(enabled)
+        if let threadsEnabledEnabledThreadSubscriptionsClosure = threadsEnabledEnabledThreadSubscriptionsClosure {
+            return threadsEnabledEnabledThreadSubscriptionsClosure(enabled, threadSubscriptions)
         } else {
-            return threadsEnabledEnabledReturnValue
+            return threadsEnabledEnabledThreadSubscriptionsReturnValue
         }
     }
 
@@ -12582,13 +12582,13 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable {
     open var fetchThreadSubscriptionThreadRootEventIdReceivedThreadRootEventId: String?
     open var fetchThreadSubscriptionThreadRootEventIdReceivedInvocations: [String] = []
 
-    var fetchThreadSubscriptionThreadRootEventIdUnderlyingReturnValue: ThreadStatus?
-    open var fetchThreadSubscriptionThreadRootEventIdReturnValue: ThreadStatus? {
+    var fetchThreadSubscriptionThreadRootEventIdUnderlyingReturnValue: ThreadSubscription?
+    open var fetchThreadSubscriptionThreadRootEventIdReturnValue: ThreadSubscription? {
         get {
             if Thread.isMainThread {
                 return fetchThreadSubscriptionThreadRootEventIdUnderlyingReturnValue
             } else {
-                var returnValue: ThreadStatus?? = nil
+                var returnValue: ThreadSubscription?? = nil
                 DispatchQueue.main.sync {
                     returnValue = fetchThreadSubscriptionThreadRootEventIdUnderlyingReturnValue
                 }
@@ -12606,9 +12606,9 @@ open class RoomSDKMock: MatrixRustSDK.Room, @unchecked Sendable {
             }
         }
     }
-    open var fetchThreadSubscriptionThreadRootEventIdClosure: ((String) async throws -> ThreadStatus?)?
+    open var fetchThreadSubscriptionThreadRootEventIdClosure: ((String) async throws -> ThreadSubscription?)?
 
-    open override func fetchThreadSubscription(threadRootEventId: String) async throws -> ThreadStatus? {
+    open override func fetchThreadSubscription(threadRootEventId: String) async throws -> ThreadSubscription? {
         if let error = fetchThreadSubscriptionThreadRootEventIdThrowableError {
             throw error
         }
diff --git a/ElementX/Sources/Other/Extensions/ClientBuilder.swift b/ElementX/Sources/Other/Extensions/ClientBuilder.swift
index 33b90bc33..1ec9ad66d 100644
--- a/ElementX/Sources/Other/Extensions/ClientBuilder.swift
+++ b/ElementX/Sources/Other/Extensions/ClientBuilder.swift
@@ -25,7 +25,7 @@ extension ClientBuilder {
             .enableOidcRefreshLock()
             .setSessionDelegate(sessionDelegate: sessionDelegate)
             .userAgent(userAgent: UserAgentBuilder.makeASCIIUserAgent())
-            .threadsEnabled(enabled: threadsEnabled)
+            .threadsEnabled(enabled: threadsEnabled, threadSubscriptions: threadsEnabled)
             .requestConfig(config: .init(retryLimit: 0,
                                          timeout: requestTimeout,
                                          maxConcurrentRequests: nil,
diff --git a/project.yml b/project.yml
index db83e0226..95b7ecbeb 100644
--- a/project.yml
+++ b/project.yml
@@ -68,7 +68,7 @@ packages:
   # Element/Matrix dependencies
   MatrixRustSDK:
     url: https://github.com/element-hq/matrix-rust-components-swift
-    exactVersion: 25.08.05
+    exactVersion: 25.08.12
     # path: ../matrix-rust-sdk
   Compound:
     url: https://github.com/element-hq/compound-ios