diff --git a/clients/tabby-agent/src/config/index.ts b/clients/tabby-agent/src/config/index.ts
index fdf5fc2c2881..86a1710db39e 100644
--- a/clients/tabby-agent/src/config/index.ts
+++ b/clients/tabby-agent/src/config/index.ts
@@ -60,6 +60,12 @@ function mergeConfig(
     serverProvidedConfig.anonymousUsageTracking = { disable: true };
   }
   const merged = mergeFunction(base, configFileConfig, clientProvidedConfig, serverProvidedConfig) as ConfigData;
+
+  // remove trailing slash from endpoint
+  if (merged.server.endpoint) {
+    merged.server.endpoint = merged.server.endpoint.replace(/\/+$/, "");
+  }
+
   return merged;
 }