diff --git a/crates/agent_servers/src/gemini.rs b/crates/agent_servers/src/gemini.rs
index 2366783d22..4450f4e216 100644
--- a/crates/agent_servers/src/gemini.rs
+++ b/crates/agent_servers/src/gemini.rs
@@ -2,7 +2,7 @@ use std::path::Path;
 use std::rc::Rc;
 
 use crate::{AgentServer, AgentServerCommand};
-use acp_thread::AgentConnection;
+use acp_thread::{AgentConnection, LoadError};
 use anyhow::Result;
 use gpui::{Entity, Task};
 use project::Project;
@@ -53,7 +53,37 @@ impl AgentServer for Gemini {
                 anyhow::bail!("Failed to find gemini binary");
             };
 
-            crate::acp::connect(server_name, command, &root_dir, cx).await
+            let result = crate::acp::connect(server_name, command.clone(), &root_dir, cx).await;
+            if result.is_err() {
+                let version_fut = util::command::new_smol_command(&command.path)
+                    .args(command.args.iter())
+                    .arg("--version")
+                    .kill_on_drop(true)
+                    .output();
+
+                let help_fut = util::command::new_smol_command(&command.path)
+                    .args(command.args.iter())
+                    .arg("--help")
+                    .kill_on_drop(true)
+                    .output();
+
+                let (version_output, help_output) = futures::future::join(version_fut, help_fut).await;
+
+                let current_version = String::from_utf8(version_output?.stdout)?;
+                let supported = String::from_utf8(help_output?.stdout)?.contains(ACP_ARG);
+
+                if !supported {
+                    return Err(LoadError::Unsupported {
+                        error_message: format!(
+                            "Your installed version of Gemini {} doesn't support the Agentic Coding Protocol (ACP).",
+                            current_version
+                        ).into(),
+                        upgrade_message: "Upgrade Gemini to Latest".into(),
+                        upgrade_command: "npm install -g @google/gemini-cli@latest".into(),
+                    }.into())
+                }
+            }
+            result
         })
     }
 }