diff --git a/src/boot/axios.js b/src/boot/axios.js
index 881d81b41..81ab74f90 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -37,10 +37,11 @@ const onResponse = (response) => {
 };
 
 const onResponseError = (error) => {
-
+    if (!session.isLoggedIn()) {
+        return Promise.reject(error);
+    }
     const { response } = error;
-    const dataError = response?.data?.error;
-    let message = dataError?.message;
+    let message = response?.data?.error?.message;
 
     switch (response?.status) {
         case 500:
@@ -52,22 +53,16 @@ const onResponseError = (error) => {
         case 504:
             message = 'errors.statusGatewayTimeout';
             break;
-
-        default:
-            if(dataError?.code)
-                message = `errors.${dataError?.code}`;
+        case 401:
+            if (session.isLoggedIn()) {
+                session.destroy();
+                const hash = window.location.hash;
+                const url = hash.slice(1);
+                Router.push({ path: url });
+            }
             break;
     }
 
-    if (session.isLoggedIn() && response?.status === 401) {
-        session.destroy();
-        const hash = window.location.hash;
-        const url = hash.slice(1);
-        Router.push({ path: url });
-    } else if (!session.isLoggedIn()) {
-        return Promise.reject(error);
-    }
-
     Notify.create({
         message: t(message),
         type: 'negative',