diff --git a/js/apps/admin-ui/src/utils/client-url.test.ts b/js/apps/admin-ui/src/utils/client-url.test.ts
index e5268047b0d..fd525ab0384 100644
--- a/js/apps/admin-ui/src/utils/client-url.test.ts
+++ b/js/apps/admin-ui/src/utils/client-url.test.ts
@@ -43,7 +43,7 @@ describe("convertClientToUrl", () => {
     );
 
     //then
-    expect(result).toBe("/admin");
+    expect(result).toBe("/admin/something");
   });
 
   it("when baseUrl when rootUrl is not set", () => {
diff --git a/js/apps/admin-ui/src/utils/client-url.ts b/js/apps/admin-ui/src/utils/client-url.ts
index ce5d23a7f20..28faa653bb5 100644
--- a/js/apps/admin-ui/src/utils/client-url.ts
+++ b/js/apps/admin-ui/src/utils/client-url.ts
@@ -16,7 +16,10 @@ export const convertClientToUrl = (
   }
 
   if (rootUrl === "${authBaseUrl}") {
-    return rootUrl.replace(/\$\{(authBaseUrl)\}/, environment.serverBaseUrl);
+    return joinPath(
+      rootUrl.replace(/\$\{(authBaseUrl)\}/, environment.serverBaseUrl),
+      baseUrl || "",
+    );
   }
 
   if (rootUrl?.startsWith("http")) {