diff --git a/client/src/templates/Challenges/generic/show.tsx b/client/src/templates/Challenges/generic/show.tsx
index b3eb9ece1af..cf2a664e21c 100644
--- a/client/src/templates/Challenges/generic/show.tsx
+++ b/client/src/templates/Challenges/generic/show.tsx
@@ -254,7 +254,7 @@ const ShowGeneric = ({
                 />
               )}
 
-              {!!questions && (
+              {questions.length > 0 && (
                 <MultipleChoiceQuestions
                   questions={questions}
                   selectedOptions={selectedMcqOptions}
diff --git a/curriculum/get-challenges.js b/curriculum/get-challenges.js
index 903582d57cc..a26309f5c5d 100644
--- a/curriculum/get-challenges.js
+++ b/curriculum/get-challenges.js
@@ -324,6 +324,7 @@ function generateChallengeCreator(lang, englishPath, i18nPath) {
 
     if (!challenge.description) challenge.description = '';
     if (!challenge.instructions) challenge.instructions = '';
+    if (!challenge.questions) challenge.questions = [];
 
     // const superOrder = getSuperOrder(meta.superBlock);
     // NOTE: Use this version when a super block is in beta.
diff --git a/curriculum/schema/challenge-schema.js b/curriculum/schema/challenge-schema.js
index 085e03bc016..5f76426238c 100644
--- a/curriculum/schema/challenge-schema.js
+++ b/curriculum/schema/challenge-schema.js
@@ -243,7 +243,7 @@ const schema = Joi.object()
         challengeTypes.theOdinProject
       ],
       then: Joi.array().items(questionJoi).min(1).required(),
-      otherwise: Joi.forbidden()
+      otherwise: Joi.array().length(0)
     }),
     quizzes: Joi.when('challengeType', {
       is: challengeTypes.quiz,