diff --git a/frontend/src/stores/userStore.ts b/frontend/src/stores/userStore.ts
index 9149867..bf4ddd5 100644
--- a/frontend/src/stores/userStore.ts
+++ b/frontend/src/stores/userStore.ts
@@ -18,6 +18,17 @@ export const useUserStore = defineStore('userStore', () => {
     return user ? JSON.parse(user) : null;
   }
 
+
+  function setBaseUrl(url: string) {
+    localStorage.setItem('baseUrl', url);
+    baseUrl.value = url;
+  }
+
+  function loadBaseUrl(): string | null {
+    const url = localStorage.getItem('baseUrl');
+    return url;
+  }
+
   function setUser(user: Me | null) {
     User.value = user;
     saveUser(user)
@@ -142,6 +153,7 @@ export const useUserStore = defineStore('userStore', () => {
   }
 
   setUser(loadUser());
+  baseUrl.value = loadBaseUrl();
 
-  return { fetchSong, fetchActiveSearch, fetchSearchArtist, fetchCollections, fetchCollection, fetchRecent, fetchFavorites, fetchMe, userId, baseUrl, proxyUrl, User, setUser }
+  return { fetchSong, fetchActiveSearch, fetchSearchArtist, fetchCollections, fetchCollection, fetchRecent, fetchFavorites, fetchMe, userId, baseUrl, proxyUrl, User, setUser, setBaseUrl }
 })
diff --git a/frontend/src/views/MeView.vue b/frontend/src/views/MeView.vue
index 01b7096..f07df40 100644
--- a/frontend/src/views/MeView.vue
+++ b/frontend/src/views/MeView.vue
@@ -50,7 +50,7 @@ async function getMe() {
 
   console.log("active user: ", data.name)
   userStore.setUser(data);
-  userStore.baseUrl = data.endpoint;
+  userStore.setBaseUrl(data.endpoint);
 
 }