diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index e3f87645953b2d8efff862bc50c51f25f1f04bf7..a1ac476bbba40d97d611c3016c0f06a6cb08f2ae 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -103,14 +103,22 @@ pub struct ClientSettings {
 
 impl Settings for ClientSettings {
     fn from_defaults(content: &settings::SettingsContent, _cx: &mut App) -> Self {
+        if let Some(server_url) = &*ZED_SERVER_URL {
+            return Self {
+                server_url: server_url.clone(),
+            };
+        }
         Self {
             server_url: content.server_url.clone().unwrap(),
         }
     }
 
     fn refine(&mut self, content: &settings::SettingsContent, _: &mut App) {
+        if ZED_SERVER_URL.is_some() {
+            return;
+        }
         if let Some(server_url) = content.server_url.clone() {
-            self.server_url = server_url
+            self.server_url = server_url;
         }
     }
 
@@ -528,7 +536,7 @@ impl settings::Settings for TelemetrySettings {
         }
     }
 
-    fn refine(&mut self, content: &SettingsContent, cx: &mut App) {
+    fn refine(&mut self, content: &SettingsContent, _cx: &mut App) {
         let Some(telemetry) = &content.telemetry else {
             return;
         };