diff --git a/course/lib.php b/course/lib.php
index dddbf4544f3..994b37ef4eb 100644
--- a/course/lib.php
+++ b/course/lib.php
@@ -1772,6 +1772,7 @@ function course_delete_module($cmid) {
     // very quick on an empty table).
     $DB->delete_records('course_modules_completion', array('coursemoduleid' => $cm->id));
     $DB->delete_records('course_completion_criteria', array('moduleinstance' => $cm->id,
+                                                            'course' => $cm->course,
                                                             'criteriatype' => COMPLETION_CRITERIA_TYPE_ACTIVITY));
 
     // Delete all tag instances associated with the instance of this module.