diff --git a/package-lock.json b/package-lock.json
index 4ae91bc..d459b0e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ucentral-client",
-  "version": "2.7.0(2)",
+  "version": "2.7.0(3)",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ucentral-client",
-      "version": "2.7.0(2)",
+      "version": "2.7.0(3)",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
diff --git a/package.json b/package.json
index 22a853e..eb26ad4 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "2.7.0(2)",
+  "version": "2.7.0(3)",
   "dependencies": {
     "@coreui/coreui": "^3.4.0",
     "@coreui/icons": "^2.0.1",
diff --git a/src/constants.js b/src/constants.js
new file mode 100644
index 0000000..cdee4a0
--- /dev/null
+++ b/src/constants.js
@@ -0,0 +1,4 @@
+export const AUTH_EXPIRED_TOKEN_CODE = 9;
+export const AUTH_INVALID_TOKEN_CODE = 8;
+
+export const LOGOUT_ON_SEC_ERROR_CODES = [AUTH_EXPIRED_TOKEN_CODE, AUTH_INVALID_TOKEN_CODE];
diff --git a/src/router/index.js b/src/router/index.js
index 3136cbe..e2ae80a 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -13,7 +13,7 @@ const Routes = () => {
       path="/"
       name="Devices"
       render={(props) =>
-        currentToken !== '' && Object.keys(endpoints).length !== 0 ? (
+        currentToken !== '' && endpoints && Object.keys(endpoints).length !== 0 ? (
           <TheLayout {...props} />
         ) : (
           <ToastProvider>
diff --git a/src/utils/axiosInstance.js b/src/utils/axiosInstance.js
index 4fa346d..3e930a6 100644
--- a/src/utils/axiosInstance.js
+++ b/src/utils/axiosInstance.js
@@ -1,5 +1,6 @@
 import * as axios from 'axios';
 import axiosRetry from 'axios-retry';
+import { LOGOUT_ON_SEC_ERROR_CODES } from 'constants';
 
 const axiosInstance = axios.create();
 
@@ -27,7 +28,7 @@ axiosInstance.interceptors.response.use(
           retries += 1;
           localStorage.setItem('sec_retries', retries);
         }
-        if (error.response.data?.ErrorCode === 9) {
+        if (LOGOUT_ON_SEC_ERROR_CODES.includes(error.response.data?.ErrorCode)) {
           localStorage.removeItem('access_token');
           localStorage.removeItem('gateway_endpoints');
           sessionStorage.clear();