diff --git a/server/boot/challenge.js b/server/boot/challenge.js
index 89a28f4d88..e4e9b09484 100644
--- a/server/boot/challenge.js
+++ b/server/boot/challenge.js
@@ -280,7 +280,12 @@ module.exports = function(app) {
     debug('looking for %s', testChallengeName);
     challenge$
       .filter((challenge) => {
-        return testChallengeName.test(challenge.name);
+        return testChallengeName.test(challenge.name) &&
+          (
+            isDev ||
+            !challenge.isComingSoon ||
+            (isBeta && challenge.isBeta)
+          );
       })
       .last({ defaultValue: null })
       .flatMap(challenge => {