diff --git a/src/app/entrar/page.js b/src/app/entrar/page.js
index d058f54b170598699eecfc94a9426ef3917bd79e..87966bdfbde616c54a595a5b793171ef39ea7e8f 100644
--- a/src/app/entrar/page.js
+++ b/src/app/entrar/page.js
@@ -58,7 +58,6 @@ function Login() {
       .then((response) => {
         const token = response.data['token'];
         userStore.setToken(token);
-        saveToLocalStorage('token', token);
         router.push(redirectUrl);
       })
       .catch((error) => {
diff --git a/src/app/stores/userStore.js b/src/app/stores/userStore.js
index 3083b70d1c761819a798457d537ba11a6dfbb048..26be6a4b91c7dda267c348d7c03574fe15eadde0 100644
--- a/src/app/stores/userStore.js
+++ b/src/app/stores/userStore.js
@@ -1,20 +1,20 @@
-import mecredApi from "@/axiosConfig";
 import { create } from 'zustand';
-import { getStoredValue, removeFromLocalStorage, saveToLocalStorage } from "../handlers/localStorageHandler";
 
 const useUserStore = create((set, get) => ({
-  token: null,
+  token: localStorage.getItem('token') || null,
   data: null,
   error: null,
-  setToken: async (token) => {
+  setToken: (token) => {
+    localStorage.setItem('token', token);
     set({ token, data: null, error: null });
   },
+  clearToken: () => {
+    localStorage.removeItem('token');
+    set({ token: null })
+  },
   headers: () => {
     return { 'Authorization': `Bearer ${get().token}` };
   }
 }))
 
-// Fetch user initially, to test token saved to localStorage and to get user data
-//useUserStore.getState().fetchUser();
-
 export { useUserStore };