diff --git a/crates/client/src/user.rs b/crates/client/src/user.rs
index ab95261461..98ca06e1fc 100644
--- a/crates/client/src/user.rs
+++ b/crates/client/src/user.rs
@@ -149,12 +149,11 @@ impl UserStore {
                                 );
 
                                 cx.update(|cx| {
-                                    cx.update_global::<StaffMode, _, _>(|staff_mode, _| {
-                                        *staff_mode = info
-                                            .as_ref()
+                                    cx.set_global(
+                                        info.as_ref()
                                             .map(|info| StaffMode(info.staff))
-                                            .unwrap_or(StaffMode(false));
-                                    })
+                                            .unwrap_or(StaffMode(false)),
+                                    );
                                 });
 
                                 current_user_tx.send(user).await.ok();
diff --git a/crates/theme_selector/src/theme_selector.rs b/crates/theme_selector/src/theme_selector.rs
index 45dc36a3ad..ad22baf8b9 100644
--- a/crates/theme_selector/src/theme_selector.rs
+++ b/crates/theme_selector/src/theme_selector.rs
@@ -45,7 +45,7 @@ impl ThemeSelector {
         let original_theme = settings.theme.clone();
 
         let mut theme_names = registry
-            .list(**cx.global::<StaffMode>())
+            .list(**cx.try_global::<StaffMode>().unwrap_or(&StaffMode(false)))
             .collect::<Vec<_>>();
         theme_names.sort_unstable_by(|a, b| {
             a.is_light
diff --git a/crates/zed/src/zed.rs b/crates/zed/src/zed.rs
index af7dfdaee0..d1ec3f2451 100644
--- a/crates/zed/src/zed.rs
+++ b/crates/zed/src/zed.rs
@@ -303,7 +303,7 @@ pub fn initialize_workspace(
 
     let theme_names = app_state
         .themes
-        .list(**cx.global::<StaffMode>())
+        .list(**cx.try_global::<StaffMode>().unwrap_or(&StaffMode(false)))
         .map(|meta| meta.name)
         .collect();
     let language_names = app_state.languages.language_names();