1 files changed, 4 insertions, 4 deletions

diff --git a/src/stores/UserStore.js b/src/stores/UserStore.js
index 9d8ac5657..d1e6d6570 100644
--- a/src/stores/UserStore.js
+++ b/src/stores/UserStore.js
@@ -122,13 +122,13 @@ export default class UserStore extends Store {
   }
 
   @computed get data() {
-    this.getUserInfoRequest.execute();
-    return this.getUserInfoRequest.result || {};
+    if (!this.isLoggedIn) return {};
+    
+    return this.getUserInfoRequest.execute().result || {};
   }
 
   @computed get legacyServices() {
-    this.getLegacyServicesRequest.execute();
-    return this.getLegacyServicesRequest.result || [];
+    return this.getLegacyServicesRequest.execute() || {};
   }
 
   // Actions