diff --git a/ui/desktop/electron-app/src/services/client-daemon-manager.js b/ui/desktop/electron-app/src/services/client-daemon-manager.js
index 649c34988..407203061 100644
--- a/ui/desktop/electron-app/src/services/client-daemon-manager.js
+++ b/ui/desktop/electron-app/src/services/client-daemon-manager.js
@@ -112,16 +112,15 @@ const addTokenCliCommand = (token) => {
   const addTokenCommand = [
     'daemon',
     'add-token',
+    `-addr=${runtimeSettings.clusterUrl}`,
     '-format=json',
     '-token=env://BOUNDARY_TOKEN',
     '-keyring-type=none',
   ];
   const sanitizedToken = sanitizer.base62EscapeAndValidate(token);
 
-  // TODO: Is setting an env var for the address the only way? I'm surprised to not see an -addr flag
   const { stdout, stderr } = spawnSync(addTokenCommand, {
     BOUNDARY_TOKEN: sanitizedToken,
-    BOUNDARY_ADDR: runtimeSettings.clusterUrl,
   });
   let parsedResponse = jsonify(stdout);