diff --git a/src/utils/challenge/filter.js b/src/utils/challenge/filter.js
index 549a36c3..117e0609 100644
--- a/src/utils/challenge/filter.js
+++ b/src/utils/challenge/filter.js
@@ -180,11 +180,8 @@ function filterByUpcoming(challenge, state) {
 }
 
 function filterByUsers(challenge, state) {
-  const userId = _.get(state, 'userId', null);
-  if (userId) {
-    return _.get(challenge, ['users', userId], false);
-  }
-  return true;
+  if (!state.userChallenges) return true;
+  return state.userChallenges.find(ch => challenge.id === ch);
 }
 
 /**