diff --git a/lib/tasks/excellent_course_exercise.rake b/lib/tasks/excellent_course_exercise.rake
index a607c24a0..07c33d9e9 100644
--- a/lib/tasks/excellent_course_exercise.rake
+++ b/lib/tasks/excellent_course_exercise.rake
@@ -38,6 +38,8 @@ namespace :excellent_course_exercise do
         rand_num = index < pass_count - 1 ? 20 : rand(1..16)
       elsif exercise_question_ids.length == 17
         rand_num = index < pass_count - 1 ? rand(13..17) : rand(1..11)
+      elsif exercise_question_ids.length == 39
+        rand_num = index < pass_count - 1 ? rand(30..39) : rand(1..18)
       else
         rand_num = exercise_question_ids.length
       end