diff --git a/modules/services/MapRouletteService.js b/modules/services/MapRouletteService.js
index 2715f74bd..1bdbeb497 100644
--- a/modules/services/MapRouletteService.js
+++ b/modules/services/MapRouletteService.js
@@ -103,8 +103,7 @@ export class MapRouletteService extends AbstractSystem {
     const extent = this.context.viewport.visibleExtent();
     return this._cache.rbush.search(extent.bbox())
       .map(d => d.data)
-      .filter(task => !this._challengeID || task.parentId === this._challengeID)
-      .filter(task => task.isVisible);
+      .filter(task => (this._challengeID && task.parentId === this._challengeID) || (!this._challengeID && task.isVisible));
   }