diff --git a/course/modlib.php b/course/modlib.php
index c9e12408813..39eb4394e6a 100644
--- a/course/modlib.php
+++ b/course/modlib.php
@@ -277,6 +277,12 @@ function edit_module_post_actions($moduleinfo, $course) {
             if ($update) {
                 $item->update();
             }
+            $gradecategory = $grade_item->get_parent_category();
+            if (!empty($moduleinfo->add)) {
+                if ($grade_item->set_aggregation_fields_for_aggregation(0, $gradecategory->aggregation)) {
+                    $grade_item->update();
+                }
+            }
         }
     }
 
@@ -333,6 +339,12 @@ function edit_module_post_actions($moduleinfo, $course) {
                 } else if (isset($moduleinfo->gradecat)) {
                     $outcomeitem->set_parent($moduleinfo->gradecat);
                 }
+                $gradecategory = $outcome_item->get_parent_category();
+                if ($outcomeexists == false) {
+                    if ($outcome_item->set_aggregation_fields_for_aggregation(0, $gradecategory->aggregation)) {
+                        $outcome_item->update();
+                    }
+                }
             }
         }
     }