diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs
index cceadea49c..d895bd1331 100644
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -2447,10 +2447,10 @@ impl ContextEditor {
     }
 
     fn render_notice(&self, cx: &mut ViewContext<Self>) -> Option<AnyElement> {
-        let nudge = self
-            .assistant_panel
-            .upgrade()
-            .map(|assistant_panel| assistant_panel.read(cx).show_zed_ai_notice);
+        use feature_flags::FeatureFlagAppExt;
+        let nudge = self.assistant_panel.upgrade().map(|assistant_panel| {
+            assistant_panel.read(cx).show_zed_ai_notice && cx.has_flag::<feature_flags::ZedPro>()
+        });
 
         if let Some(error) = self.error_message.clone() {
             Some(Self::render_error_popover(error, cx).into_any_element())
diff --git a/crates/assistant/src/model_selector.rs b/crates/assistant/src/model_selector.rs
index 1b936133fd..7692093e61 100644
--- a/crates/assistant/src/model_selector.rs
+++ b/crates/assistant/src/model_selector.rs
@@ -1,4 +1,3 @@
-use feature_flags::LanguageModels;
 use feature_flags::ZedPro;
 use language_model::{LanguageModel, LanguageModelAvailability, LanguageModelRegistry};
 use proto::Plan;
@@ -194,9 +193,6 @@ impl PickerDelegate for ModelPickerDelegate {
 
     fn render_footer(&self, cx: &mut ViewContext<Picker<Self>>) -> Option<gpui::AnyElement> {
         use feature_flags::FeatureFlagAppExt;
-        if !cx.has_flag::<LanguageModels>() {
-            return None;
-        }
 
         let plan = proto::Plan::ZedPro;
         let is_trial = false;
@@ -209,26 +205,28 @@ impl PickerDelegate for ModelPickerDelegate {
                 .p_1()
                 .gap_4()
                 .justify_between()
-                .child(match plan {
-                    // Already a zed pro subscriber
-                    Plan::ZedPro => Button::new("zed-pro", "Zed Pro")
-                        .icon(IconName::ZedAssistant)
-                        .icon_size(IconSize::Small)
-                        .icon_color(Color::Muted)
-                        .icon_position(IconPosition::Start)
-                        .on_click(|_, cx| {
-                            cx.dispatch_action(Box::new(zed_actions::OpenAccountSettings))
-                        }),
-                    // Free user
-                    Plan::Free => Button::new(
-                        "try-pro",
-                        if is_trial {
-                            "Upgrade to Pro"
-                        } else {
-                            "Try Pro"
-                        },
-                    )
-                    .on_click(|_, cx| cx.open_url(TRY_ZED_PRO_URL)),
+                .when(cx.has_flag::<ZedPro>(), |this| {
+                    this.child(match plan {
+                        // Already a zed pro subscriber
+                        Plan::ZedPro => Button::new("zed-pro", "Zed Pro")
+                            .icon(IconName::ZedAssistant)
+                            .icon_size(IconSize::Small)
+                            .icon_color(Color::Muted)
+                            .icon_position(IconPosition::Start)
+                            .on_click(|_, cx| {
+                                cx.dispatch_action(Box::new(zed_actions::OpenAccountSettings))
+                            }),
+                        // Free user
+                        Plan::Free => Button::new(
+                            "try-pro",
+                            if is_trial {
+                                "Upgrade to Pro"
+                            } else {
+                                "Try Pro"
+                            },
+                        )
+                        .on_click(|_, cx| cx.open_url(TRY_ZED_PRO_URL)),
+                    })
                 })
                 .child(
                     Button::new("configure", "Configure")