diff --git a/package-lock.json b/package-lock.json
index f1cd822..a24789d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "ucentral-client",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "ucentral-client",
-      "version": "2.2.6",
+      "version": "2.2.7",
       "dependencies": {
         "@coreui/coreui": "^3.4.0",
         "@coreui/icons": "^2.0.1",
diff --git a/package.json b/package.json
index 262795a..ceb8177 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ucentral-client",
-  "version": "2.2.6",
+  "version": "2.2.7",
   "dependencies": {
     "@coreui/coreui": "^3.4.0",
     "@coreui/icons": "^2.0.1",
diff --git a/src/pages/LoginPage/index.js b/src/pages/LoginPage/index.js
index af85990..aa9f93e 100644
--- a/src/pages/LoginPage/index.js
+++ b/src/pages/LoginPage/index.js
@@ -234,7 +234,7 @@ const Login = () => {
             for (const endpoint of response.data.endpoints) {
               endpoints[endpoint.type] = endpoint.uri;
             }
-            getGatewayUIUrl(token, endpoints.owgw);
+            if (endpoints.owgw) getGatewayUIUrl(token, endpoints.owgw);
             setItem('gateway_endpoints', JSON.stringify(endpoints));
             setEndpoints(endpoints);
             setCurrentToken(token);
@@ -345,6 +345,7 @@ const Login = () => {
           for (const endpoint of response.data.endpoints) {
             endpoints[endpoint.type] = endpoint.uri;
           }
+          if (endpoints.owgw) getGatewayUIUrl(token, endpoints.owgw);
           setItem('gateway_endpoints', JSON.stringify(endpoints));
           setEndpoints(endpoints);
           setCurrentToken(token);