diff --git a/ElementX/Sources/Services/Client/Client.swift b/ElementX/Sources/Services/Client/Client.swift
index aa2e0580a..c1b922e1d 100644
--- a/ElementX/Sources/Services/Client/Client.swift
+++ b/ElementX/Sources/Services/Client/Client.swift
@@ -9,7 +9,7 @@
 import Foundation
 import MatrixRustSDK
 
-extension ClientProtocol {
+nonisolated extension ClientProtocol {
     func elementWellKnown() async -> Result<Data, ClientProxyError> {
         let serverNameURLString = if let userIDServerName = try? userIdServerName() {
             "https://\(userIDServerName)"
diff --git a/ElementX/Sources/Services/Client/ClientProxyProtocol.swift b/ElementX/Sources/Services/Client/ClientProxyProtocol.swift
index 4c0931c10..917867aed 100644
--- a/ElementX/Sources/Services/Client/ClientProxyProtocol.swift
+++ b/ElementX/Sources/Services/Client/ClientProxyProtocol.swift
@@ -41,6 +41,7 @@ enum ClientProxyError: Error {
     
     case invalidMedia
     case invalidServerName
+    case invalidHomeserverURL
     case failedUploadingMedia(ErrorKind)
     case roomPreviewIsPrivate
     case failedRetrievingUserIdentity
diff --git a/Enterprise b/Enterprise
index 9c0ac45da..301d4e4ab 160000
--- a/Enterprise
+++ b/Enterprise
@@ -1 +1 @@
-Subproject commit 9c0ac45dac889d6041582ba4aa2d6f414ba8286f
+Subproject commit 301d4e4ab035788994513aced3c66d680f0d0f78