diff --git a/frontend/src/util/UEInfoApiHelper.js b/frontend/src/util/UEInfoApiHelper.js
index 3bf081a3538038328753a9380a5f5f14f155ead6..bd29de780282892460680cebe96d86307b3f3bc5 100644
--- a/frontend/src/util/UEInfoApiHelper.js
+++ b/frontend/src/util/UEInfoApiHelper.js
@@ -10,21 +10,19 @@ class UeInfoApiHelper {
       let url =  "registered-ue-context"
       // console.log("Making request to ", url, " ....")
       let response = await Http.get(url);
-      if (response.status === 200 && response.data) {
 
-        const registered_users = response.data.map(
-            function(ue_context) {
+      if (response.status === 200) {
+        let registered_users = [];
 
-              return new UEInfo(
-                ue_context.Supi,
-                ue_context.CmState
-              );
-            });
+        if (response.data) {
+          registered_users = response.data.map(ue_context =>
+            new UEInfo(ue_context.Supi, ue_context.CmState)
+          );
+        }
 
         store.dispatch(ueinfoActions.setRegisteredUE(registered_users));
         return true;
       } else {
-
         console.log("Request failed, url:", url)
         console.log("Response: ", response.status, response.data)