diff --git a/lib/moodlelib.php b/lib/moodlelib.php
index 91672184507..ffe96195f0c 100644
--- a/lib/moodlelib.php
+++ b/lib/moodlelib.php
@@ -3378,8 +3378,6 @@ function delete_course($courseid, $showfeedback = true) {
         return false;
     }
 
-    $context = get_context_instance(CONTEXT_COURSE, $courseid);
-
     if (!remove_course_contents($courseid, $showfeedback)) {
         if ($showfeedback) {
             notify("An error occurred while deleting some of the course contents.");
@@ -3387,9 +3385,6 @@ function delete_course($courseid, $showfeedback = true) {
         $result = false;
     }
 
-    remove_course_grades($courseid, $showfeedback);
-    remove_grade_letters($context, $showfeedback);
-
     if (!delete_records("course", "id", $courseid)) {
         if ($showfeedback) {
             notify("An error occurred while deleting the main course record.");
@@ -3580,6 +3575,11 @@ function remove_course_contents($courseid, $showfeedback=true) {
 /// Delete questions and question categories
     question_delete_course($course, $showfeedback);
 
+/// Remove all data from gradebook
+    $context = get_context_instance(CONTEXT_COURSE, $courseid);
+    remove_course_grades($courseid, $showfeedback);
+    remove_grade_letters($context, $showfeedback);
+
     return $result;
 }