diff --git a/Tusker/Screens/Compose/ComposeHostingController.swift b/Tusker/Screens/Compose/ComposeHostingController.swift
index 8dfcf4ef..6259771d 100644
--- a/Tusker/Screens/Compose/ComposeHostingController.swift
+++ b/Tusker/Screens/Compose/ComposeHostingController.swift
@@ -27,6 +27,8 @@ class ComposeHostingController: UIHostingController<ComposeHostingController.Vie
     let controller: ComposeController
     let mastodonController: MastodonController
     
+    private var cancellables = Set<AnyCancellable>()
+    
     private var assetPickerCompletion: (@MainActor ([PHPickerResult]) -> Void)?
     private var drawingCompletion: ((PKDrawing) -> Void)?
     
@@ -44,7 +46,6 @@ class ComposeHostingController: UIHostingController<ComposeHostingController.Vie
             replyContentView: { AnyView(ComposeReplyContentView(status: $0, mastodonController: mastodonController, heightChanged: $1)) },
             emojiImageView: { AnyView(CustomEmojiImageView(emoji: $0)) }
         )
-        controller.currentAccount = mastodonController.account
         
         self.mastodonController = mastodonController
         
@@ -58,6 +59,12 @@ class ComposeHostingController: UIHostingController<ComposeHostingController.Vie
         
         // set an initial title immediately, in case we're starting ducked
         self.navigationItem.title = self.controller.navigationTitle
+        
+        mastodonController.$account
+            .sink { [unowned self] in
+                self.controller.currentAccount = $0
+            }
+            .store(in: &cancellables)
     }
     
     required init?(coder aDecoder: NSCoder) {