diff --git a/Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift b/Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift
index d0e38986b..ec91d9c82 100644
--- a/Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift
+++ b/Mastodon/Protocol/Provider/DataSourceFacade+Profile.swift
@@ -56,22 +56,20 @@ extension DataSourceFacade {
     ) async {
         provider.coordinator.showLoading()
 
-        Task {
-            do {
-                guard let account = try await provider.context.apiService.fetchUser(
-                    username: username,
-                    domain: domain,
-                    authenticationBox: provider.authContext.mastodonAuthenticationBox
-                ) else {
-                    return provider.coordinator.hideLoading()
-                }
-
-                provider.coordinator.hideLoading()
-
-                await coordinateToProfileScene(provider: provider, account: account)
-            } catch {
-                provider.coordinator.hideLoading()
+        do {
+            guard let account = try await provider.context.apiService.fetchUser(
+                username: username,
+                domain: domain,
+                authenticationBox: provider.authContext.mastodonAuthenticationBox
+            ) else {
+                return provider.coordinator.hideLoading()
             }
+
+            provider.coordinator.hideLoading()
+
+            await coordinateToProfileScene(provider: provider, account: account)
+        } catch {
+            provider.coordinator.hideLoading()
         }
     }
 
@@ -83,7 +81,6 @@ extension DataSourceFacade {
     ) async {
         provider.coordinator.showLoading()
 
-        Task {
             do {
                 let account = try await provider.context.apiService.accountInfo(
                     domain: domain,
@@ -96,7 +93,6 @@ extension DataSourceFacade {
                 await coordinateToProfileScene(provider: provider, account: account)
             } catch {
                 provider.coordinator.hideLoading()
-            }
         }
     }
 
diff --git a/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift b/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift
index 3d51393b9..fc35c6f83 100644
--- a/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift
+++ b/Mastodon/Scene/Onboarding/Login/MastodonLoginViewController.swift
@@ -142,13 +142,12 @@ class MastodonLoginViewController: UIViewController, NeedsDependency {
 
         authenticationViewModel
             .authenticated.sink { (domain, account) in
-                Task {
+                Task { @MainActor in
                     do {
                         _ = try await self.context.authenticationService.activeMastodonUser(domain: domain, userID: account.id)
                         FileManager.default.store(account: account, forUserID: MastodonUserIdentifier(domain: domain, userID: account.id))
-                        Task { @MainActor in
-                            self.coordinator.setup()
-                        }
+
+                        self.coordinator.setup()
                     } catch {
                         assertionFailure(error.localizedDescription)
                     }