diff --git a/Packages/Account/Sources/Account/AccountDetailView.swift b/Packages/Account/Sources/Account/AccountDetailView.swift
index 30a0a36a..351f7b05 100644
--- a/Packages/Account/Sources/Account/AccountDetailView.swift
+++ b/Packages/Account/Sources/Account/AccountDetailView.swift
@@ -94,11 +94,16 @@ public struct AccountDetailView: View {
     .edgesIgnoringSafeArea(.top)
     .navigationBarTitleDisplayMode(.inline)
     .toolbar {
-        ToolbarItem(placement: .principal) {
-            if scrollOffset < -200 {
-                currentAccount.account?.displayNameWithEmojis
-            }
+      ToolbarItem(placement: .principal) {
+        if scrollOffset < -200 {
+          switch viewModel.accountState {
+          case let .data(account):
+            account.displayNameWithEmojis.font(.headline)
+          default:
+            EmptyView()
+          }
         }
+      }
     }
   }