diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginCoordinator.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginCoordinator.swift
index 8521f473d..0f51a97fb 100644
--- a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginCoordinator.swift
+++ b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginCoordinator.swift
@@ -55,7 +55,7 @@ final class LoginCoordinator: Coordinator, Presentable {
 
     // Must be used only internally
     var childCoordinators: [Coordinator] = []
-    var callback: (@MainActor(LoginCoordinatorAction) -> Void)?
+    var callback: (@MainActor (LoginCoordinatorAction) -> Void)?
     
     // MARK: - Setup
     
diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModel.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModel.swift
index d8ecc0e62..9c8cf59a6 100644
--- a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModel.swift
+++ b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModel.swift
@@ -23,7 +23,7 @@ class LoginViewModel: LoginViewModelType, LoginViewModelProtocol {
 
     // MARK: Public
 
-    var callback: (@MainActor(LoginViewModelAction) -> Void)?
+    var callback: (@MainActor (LoginViewModelAction) -> Void)?
 
     // MARK: - Setup
 
diff --git a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModelProtocol.swift b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModelProtocol.swift
index 768bbc8cc..7934e98fd 100644
--- a/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModelProtocol.swift
+++ b/ElementX/Sources/Screens/Authentication/LoginScreen/LoginViewModelProtocol.swift
@@ -18,7 +18,7 @@ import Foundation
 
 @MainActor
 protocol LoginViewModelProtocol {
-    var callback: (@MainActor(LoginViewModelAction) -> Void)? { get set }
+    var callback: (@MainActor (LoginViewModelAction) -> Void)? { get set }
     var context: LoginViewModelType.Context { get }
     
     /// Update the view to reflect that a new homeserver is being loaded.
diff --git a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionCoordinator.swift b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionCoordinator.swift
index 2aebb2e6f..3d5e900d7 100644
--- a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionCoordinator.swift
+++ b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionCoordinator.swift
@@ -45,7 +45,7 @@ final class ServerSelectionCoordinator: Coordinator, Presentable {
 
     // Must be used only internally
     var childCoordinators: [Coordinator] = []
-    var callback: (@MainActor(ServerSelectionCoordinatorAction) -> Void)?
+    var callback: (@MainActor (ServerSelectionCoordinatorAction) -> Void)?
     
     // MARK: - Setup
     
diff --git a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModel.swift b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModel.swift
index a60045e66..ac0272079 100644
--- a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModel.swift
+++ b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModel.swift
@@ -25,7 +25,7 @@ class ServerSelectionViewModel: ServerSelectionViewModelType, ServerSelectionVie
 
     // MARK: Public
 
-    var callback: (@MainActor(ServerSelectionViewModelAction) -> Void)?
+    var callback: (@MainActor (ServerSelectionViewModelAction) -> Void)?
 
     // MARK: - Setup
 
diff --git a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModelProtocol.swift b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModelProtocol.swift
index 72bc3404f..5a509ab38 100644
--- a/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModelProtocol.swift
+++ b/ElementX/Sources/Screens/Authentication/ServerSelection/ServerSelectionViewModelProtocol.swift
@@ -18,7 +18,7 @@ import Foundation
 
 @MainActor
 protocol ServerSelectionViewModelProtocol {
-    var callback: (@MainActor(ServerSelectionViewModelAction) -> Void)? { get set }
+    var callback: (@MainActor (ServerSelectionViewModelAction) -> Void)? { get set }
     var context: ServerSelectionViewModelType.Context { get }
     
     /// Displays an error to the user.
diff --git a/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift b/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift
index 4364c384e..9516e6b92 100644
--- a/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift
+++ b/ElementX/Sources/Screens/RoomScreen/RoomScreenModels.swift
@@ -40,7 +40,7 @@ struct RoomScreenViewState: BindableState {
     var isBackPaginating = false
     var bindings: RoomScreenViewStateBindings
     
-    var contextMenuBuilder: (@MainActor(_ itemId: String) -> TimelineItemContextMenu)?
+    var contextMenuBuilder: (@MainActor (_ itemId: String) -> TimelineItemContextMenu)?
     
     var sendButtonDisabled: Bool {
         bindings.composerText.count == 0
diff --git a/ElementX/Sources/Services/BugReport/ScreenshotDetector.swift b/ElementX/Sources/Services/BugReport/ScreenshotDetector.swift
index 049fda318..960e4428b 100644
--- a/ElementX/Sources/Services/BugReport/ScreenshotDetector.swift
+++ b/ElementX/Sources/Services/BugReport/ScreenshotDetector.swift
@@ -17,7 +17,7 @@ enum ScreenshotDetectorError: String, Error {
 
 @MainActor
 class ScreenshotDetector {
-    var callback: (@MainActor(UIImage?, Error?) -> Void)?
+    var callback: (@MainActor (UIImage?, Error?) -> Void)?
 
     /// Flag to whether ask for photos authorization by default if needed.
     var autoRequestPHAuthorization = true