diff --git a/src/Nitro/CommandLine/src/CommandLine/Extensions/ApiClientCommandLineBuilderExtensions.cs b/src/Nitro/CommandLine/src/CommandLine/Extensions/ApiClientCommandLineBuilderExtensions.cs
index 5d754c418bb..8a3e9ca0404 100644
--- a/src/Nitro/CommandLine/src/CommandLine/Extensions/ApiClientCommandLineBuilderExtensions.cs
+++ b/src/Nitro/CommandLine/src/CommandLine/Extensions/ApiClientCommandLineBuilderExtensions.cs
@@ -43,18 +43,23 @@ private static IHttpClientFactory ConfigureClientFactory(IServiceProvider sp)
                 }
                 else if (!string.IsNullOrWhiteSpace(cloudUrl))
                 {
-                    if (Uri.TryCreate(cloudUrl, Absolute, out var uri))
-                    {
-                        client.BaseAddress = uri;
-                    }
-                    else if (Uri.TryCreate($"https://{cloudUrl}/graphql", Absolute, out uri))
-                    {
-                        client.BaseAddress = uri;
-                    }
-                    else
+                    if (!Uri.TryCreate(cloudUrl, Absolute, out var uri)
+                        && !Uri.TryCreate($"https://{cloudUrl}", Absolute, out uri))
                     {
                         throw new ExitException($"Could not parse cloud URL: {cloudUrl}");
                     }
+
+                    // Ensure that Uri is always <host>/graphql
+                    var uriBuilder = new UriBuilder(uri)
+                    {
+                        Path = "/graphql",
+                        Query = string.Empty,
+                        Fragment = string.Empty,
+                        UserName = string.Empty,
+                        Password = string.Empty
+                    };
+
+                    client.BaseAddress = uriBuilder.Uri;
                 }
                 else
                 {