diff --git a/app/models/application_form.rb b/app/models/application_form.rb
index fa5947a8a11..42c163f7f3e 100644
--- a/app/models/application_form.rb
+++ b/app/models/application_form.rb
@@ -429,7 +429,7 @@ def editable?
 
   def contains_course?(course)
     potential_course_option_ids = CourseOption.where(course_id: course.id).map(&:id)
-    current_course_option_ids = application_choices.map(&:course_option_id)
+    current_course_option_ids = application_choices.where({ status: ApplicationStateChange::NON_REAPPLY_STATUSES }).map(&:course_option_id)
 
     potential_course_option_ids.intersect?(current_course_option_ids)
   end