diff --git a/frontend/src/state/backendApi.ts b/frontend/src/state/backendApi.ts
index 3829c35df..6700e79a1 100644
--- a/frontend/src/state/backendApi.ts
+++ b/frontend/src/state/backendApi.ts
@@ -429,7 +429,7 @@ const apiStore = {
 
         // do it
         const transport = createConnectTransport({
-            baseUrl: 'http://localhost:9090',
+            baseUrl: window.location.origin,
         });
 
         const client = createPromiseClient(ConsoleService, transport);
@@ -622,7 +622,7 @@ const apiStore = {
         // https://github.com/connectrpc/examples-es
         
         const transport = createConnectTransport({
-            baseUrl: 'http://localhost:9090',
+            baseUrl: window.location.origin,
         });
 
         const client = createPromiseClient(ConsoleService, transport);