diff --git a/crates/core/src/token/mod.rs b/crates/core/src/token/mod.rs
index ba6dd70..578cdca 100644
--- a/crates/core/src/token/mod.rs
+++ b/crates/core/src/token/mod.rs
@@ -156,10 +156,16 @@ impl AccessTokenModel {
             })?;
 
         if matches!(token_model.token_type, TokenType::WebUI) {
-            let life = utc_now!() - token_model.created_at;
-            let max_life = SETTINGS.bichon_webui_token_expiration_hours * 60 * 60 * 1000;
+            // Use last_access_at if set, otherwise fall back to created_at
+            let last_active = if token_model.last_access_at > 0 {
+                token_model.last_access_at
+            } else {
+                token_model.created_at
+            };
+            let idle = utc_now!() - last_active;
+            let max_life = SETTINGS.bichon_webui_token_expiration_hours as i64 * 60 * 60 * 1000;
 
-            if life > (max_life as i64) {
+            if idle > max_life {
                 return Err(raise_error!(
                     "Permission denied: the WebUI token has expired.".into(),
                     ErrorCode::PermissionDenied
@@ -176,13 +182,15 @@ impl AccessTokenModel {
                     ));
                 }
             }
-            update_impl(DB_MANAGER.db(), &token_str, |current: AccessTokenModel| {
-                let mut updated = current.clone();
-                updated.last_access_at = utc_now!();
-                Ok(updated)
-            })?;
         }
 
+        // Update last_access_at on every successful use for both token types
+        update_impl(DB_MANAGER.db(), &token_str, |current: AccessTokenModel| {
+            let mut updated = current.clone();
+            updated.last_access_at = utc_now!();
+            Ok(updated)
+        })?;
+
         let user = UserModel::find(token_model.user_id)
             ?
             .ok_or_else(|| raise_error!("The user associated with this access token does not exist or may have been deleted.".into(), ErrorCode::ResourceNotFound))?;
diff --git a/web/src/main.tsx b/web/src/main.tsx
index 26b898b..2c7151c 100644
--- a/web/src/main.tsx
+++ b/web/src/main.tsx
@@ -42,12 +42,6 @@ const handleAxiosError = (error: any) => {
 
   switch (error.response?.status) {
     case 401:
-      toast({
-        variant: 'destructive',
-        title: i18n.t('auth.sessionExpired'),
-        description: i18n.t('auth.sessionExpiredDesc'),
-        action: <ToastAction altText={i18n.t('common.close')}>{i18n.t('common.close')}</ToastAction>,
-      });
       resetToken();
       const currentPath = router.history.location.pathname;
       if (currentPath !== '/sign-in') {