diff --git a/mod/glossary/lib.php b/mod/glossary/lib.php
index cbd7f6841b0..9fdaaff73f4 100644
--- a/mod/glossary/lib.php
+++ b/mod/glossary/lib.php
@@ -345,7 +345,7 @@ function glossary_get_user_grades($glossary, $userid=0) {
 /**
  * Update activity grades
  *
- * @param object $glossary null means all glossaries
+ * @param object $glossary null means all glossaries (with extra cmidnumber property)
  * @param int $userid specific user only, 0 means all
  */
 function glossary_update_grades($glossary=null, $userid=0, $nullifnone=true) {
@@ -410,16 +410,7 @@ function glossary_grade_item_update($glossary, $grades=NULL) {
     global $CFG;
     require_once($CFG->libdir.'/gradelib.php');
 
-    if(!empty($glossary->cmidnumber)){
-        $params = array('itemname'=>$glossary->name, 'idnumber'=>$glossary->cmidnumber);
-    }else{
-        // MDL-14303
-        if ($cm = get_coursemodule_from_instance('glossary', $glossary->id)) {
-            $params = array('itemname'=>$glossary->name, 'idnumber'=>$cm->id);
-        } else {
-            return false;
-        }
-    }
+    $params = array('itemname'=>$glossary->name, 'idnumber'=>$glossary->cmidnumber);
 
     if (!$glossary->assessed or $glossary->scale == 0) {
         $params['gradetype'] = GRADE_TYPE_NONE;
diff --git a/mod/glossary/rate.php b/mod/glossary/rate.php
index 58f2a9f6900..14375131c7b 100644
--- a/mod/glossary/rate.php
+++ b/mod/glossary/rate.php
@@ -28,6 +28,8 @@
 
     $context = get_context_instance(CONTEXT_MODULE, $cm->id);
 
+    $glossary->cmidnumber = $cm->idnumber;
+
     if (!$glossary->assessed) {
         print_error('nopermissiontorate');
     }