diff --git a/src/frontend/src/functions/auth.tsx b/src/frontend/src/functions/auth.tsx
index ec49f7fba5..652429d052 100644
--- a/src/frontend/src/functions/auth.tsx
+++ b/src/frontend/src/functions/auth.tsx
@@ -53,7 +53,11 @@ export const doBasicLogin = async (username: string, password: string) => {
  */
 export const doLogout = async (navigate: any) => {
   // Logout from the server session
-  await api.post(apiUrl(ApiEndpoints.user_logout));
+  await api.post(apiUrl(ApiEndpoints.user_logout)).catch(() => {
+    // If an error occurs here, we are likely already logged out
+    navigate('/login');
+    return;
+  });
 
   // Logout from this session
   // Note that clearToken() then calls setApiDefaults()
diff --git a/src/frontend/src/states/SettingsState.tsx b/src/frontend/src/states/SettingsState.tsx
index 414ff095e3..61aec8ff08 100644
--- a/src/frontend/src/states/SettingsState.tsx
+++ b/src/frontend/src/states/SettingsState.tsx
@@ -41,8 +41,8 @@ export const useGlobalSettingsState = create<SettingsStateProps>(
             lookup: generate_lookup(response.data)
           });
         })
-        .catch((error) => {
-          console.error('Error fetching global settings:', error);
+        .catch((_error) => {
+          console.error('Error fetching global settings');
         });
     },
     getSetting: (key: string, default_value?: string) => {
@@ -75,8 +75,8 @@ export const useUserSettingsState = create<SettingsStateProps>((set, get) => ({
           lookup: generate_lookup(response.data)
         });
       })
-      .catch((error) => {
-        console.error('Error fetching user settings:', error);
+      .catch((_error) => {
+        console.error('Error fetching user settings');
       });
   },
   getSetting: (key: string, default_value?: string) => {
@@ -115,11 +115,8 @@ export const createPluginSettingsState = ({
             lookup: generate_lookup(settings)
           });
         })
-        .catch((error) => {
-          console.error(
-            `Error fetching plugin settings for plugin ${plugin}:`,
-            error
-          );
+        .catch((_error) => {
+          console.error(`Error fetching plugin settings for plugin ${plugin}`);
         });
     },
     getSetting: (key: string, default_value?: string) => {
diff --git a/src/frontend/src/states/UserState.tsx b/src/frontend/src/states/UserState.tsx
index ef17a8bdf6..5cd27c8bef 100644
--- a/src/frontend/src/states/UserState.tsx
+++ b/src/frontend/src/states/UserState.tsx
@@ -54,8 +54,8 @@ export const useUserState = create<UserStateProps>((set, get) => ({
         };
         set({ user: user });
       })
-      .catch((error) => {
-        console.error('Error fetching user data:', error);
+      .catch((_error) => {
+        console.error('Error fetching user data');
       });
 
     // Fetch role data
@@ -65,13 +65,15 @@ export const useUserState = create<UserStateProps>((set, get) => ({
         const user: UserProps = get().user as UserProps;
 
         // Update user with role data
-        user.roles = response.data?.roles ?? {};
-        user.is_staff = response.data?.is_staff ?? false;
-        user.is_superuser = response.data?.is_superuser ?? false;
-        set({ user: user });
+        if (user) {
+          user.roles = response.data?.roles ?? {};
+          user.is_staff = response.data?.is_staff ?? false;
+          user.is_superuser = response.data?.is_superuser ?? false;
+          set({ user: user });
+        }
       })
-      .catch((error) => {
-        console.error('Error fetching user roles:', error);
+      .catch((_error) => {
+        console.error('Error fetching user roles');
       });
   },
   checkUserRole: (role: UserRoles, permission: UserPermissions) => {