diff --git a/server/services/user.js b/server/services/user.js
index a574d38435..727ec32223 100644
--- a/server/services/user.js
+++ b/server/services/user.js
@@ -48,7 +48,7 @@ export default function userServices() {
       Observable.if(
         () => !user,
         Observable.of({}),
-        user.getChallengeMap$()
+        Observable.defer(() => user.getChallengeMap$())
           .map(challengeMap => ({ ...user.toJSON(), challengeMap }))
           .map(user => ({
             entities: {