diff --git a/crates/goose-cli/src/commands/session.rs b/crates/goose-cli/src/commands/session.rs
index 755cc30e2..c3dd7373d 100644
--- a/crates/goose-cli/src/commands/session.rs
+++ b/crates/goose-cli/src/commands/session.rs
@@ -62,15 +62,10 @@ pub async fn build_session<'a>(
             .expect("should resolve executable to string path"),
     )
     .with_args(vec!["mcp", "developer"]);
-    let jbconfig = SystemConfig::stdio("goose").with_args(vec!["mcp", "jetbrains"]);
     agent
         .add_system(config)
         .await
         .expect("should start developer server");
-    agent
-        .add_system(jbconfig)
-        .await
-        .expect("should start jetbrains server");
 
     let prompt = match std::env::var("GOOSE_INPUT") {
         Ok(val) => match val.as_str() {
diff --git a/ui/desktop/src/ChatWindow.tsx b/ui/desktop/src/ChatWindow.tsx
index d51535a97..124fcfa60 100644
--- a/ui/desktop/src/ChatWindow.tsx
+++ b/ui/desktop/src/ChatWindow.tsx
@@ -419,7 +419,6 @@ export default function ChatWindow() {
   // Initialize system config when window loads
   useEffect(() => {
     addSystemConfig("developer");
-    addSystemConfig("jetbrains");
   }, []);
 
   window.electron.logInfo('ChatWindow loaded');