diff --git a/course/completion.php b/course/completion.php
index 861a576048b..354c6a11ba7 100644
--- a/course/completion.php
+++ b/course/completion.php
@@ -143,11 +143,13 @@ if ($form->is_cancelled()){
     $aggregation->insert();
 
     // Update course total passing grade
-    if ($grade_item = grade_category::fetch_course_category($course->id)->grade_item) {
-        $grade_item->gradepass = $data->criteria_grade_value;
-        if (method_exists($grade_item, 'update')) {
-            $grade_item->update('course/completion.php');
-        }
+    if (!empty($data->criteria_grade)) {
+    	if ($grade_item = grade_category::fetch_course_category($course->id)->grade_item) {
+        	$grade_item->gradepass = $data->criteria_grade_value;
+        	if (method_exists($grade_item, 'update')) {
+            	$grade_item->update('course/completion.php');
+        	}
+    	}
     }
 
     redirect($CFG->wwwroot."/course/view.php?id=$course->id", get_string('changessaved'));