1 files changed, 6 insertions, 10 deletions
diff --git a/packages/demobank-ui/src/hooks/backend.ts b/packages/demobank-ui/src/hooks/backend.ts
index 3f2981edf..3eaf1f186 100644
--- a/packages/demobank-ui/src/hooks/backend.ts
+++ b/packages/demobank-ui/src/hooks/backend.ts
@@ -42,26 +42,23 @@ export interface BackendCredentials {
 }
 
 interface LoggedIn extends BackendCredentials {
-  url: string;
   status: "loggedIn";
   isUserAdministrator: boolean;
 }
 interface LoggedOut {
-  url: string;
   status: "loggedOut";
 }
 
-const maybeRootPath = bankUiSettings.backendBaseURL;
-
 export function getInitialBackendBaseURL(): string {
   const overrideUrl = localStorage.getItem("bank-base-url");
 
-  return canonicalizeBaseUrl(overrideUrl ? overrideUrl : maybeRootPath);
+  return canonicalizeBaseUrl(
+    overrideUrl ? overrideUrl : bankUiSettings.backendBaseURL,
+  );
 }
 
 export const defaultState: BackendState = {
   status: "loggedOut",
-  url: getInitialBackendBaseURL(),
 };
 
 export interface BackendStateHandler {
@@ -91,13 +88,12 @@ export function useBackendState(): BackendStateHandler {
   return {
     state,
     logOut() {
-      update(JSON.stringify({ ...defaultState, url: state.url }));
+      update(JSON.stringify({ ...defaultState }));
     },
     logIn(info) {
       //admin is defined by the username
       const nextState: BackendState = {
         status: "loggedIn",
-        url: state.url,
         ...info,
         isUserAdministrator: info.username === "admin",
       };
@@ -125,7 +121,7 @@ export function usePublicBackend(): useBackendType {
   const { state } = useBackendContext();
   const { request: requestHandler } = useApiContext();
 
-  const baseUrl = state.url;
+  const baseUrl = getInitialBackendBaseURL();
 
   const request = useCallback(
     function requestImpl<T>(
@@ -201,7 +197,7 @@ export function useAuthenticatedBackend(): useBackendType {
   const { request: requestHandler } = useApiContext();
 
   const creds = state.status === "loggedIn" ? state : undefined;
-  const baseUrl = state.url;
+  const baseUrl = getInitialBackendBaseURL();
 
   const request = useCallback(
     function requestImpl<T>(