diff --git a/zed/src/rpc.rs b/zed/src/rpc.rs
index 6ae83354e0e250783d200f1cebb5873510d6db29..5dc2b49b76d9ac8ca958f6dc3903a8da3603dbcd 100644
--- a/zed/src/rpc.rs
+++ b/zed/src/rpc.rs
@@ -30,7 +30,9 @@ use zrpc::{
 lazy_static! {
     static ref ZED_SERVER_URL: String =
         std::env::var("ZED_SERVER_URL").unwrap_or("https://zed.dev:443".to_string());
-    static ref IMPERSONATE_LOGIN: Option<String> = std::env::var("ZED_IMPERSONATE").ok();
+    static ref IMPERSONATE_LOGIN: Option<String> = std::env::var("ZED_IMPERSONATE")
+        .ok()
+        .and_then(|s| if s.is_empty() { None } else { Some(s) });
 }
 
 pub struct Client {