diff --git a/www/core/components/grades/templates/grade.html b/www/core/components/grades/templates/grade.html
index 91723f837fe..492d620a809 100644
--- a/www/core/components/grades/templates/grade.html
+++ b/www/core/components/grades/templates/grade.html
@@ -5,10 +5,14 @@
         </ion-refresher>
         <mm-loading hide-until="gradeLoaded">
             <div ng-if="grade">
-                <a ng-if="grade.itemname" mm-link capture-link="true" class="item item-divider" href="{{ grade.link }}" title="{{ grade.itemname }}">
+                <a ng-if="grade.itemname && grade.link" mm-link capture-link="true" class="item item-divider" href="{{ grade.link }}" title="{{ grade.itemname }}">
                     <h2><mm-format-text watch="true">{{ grade.itemname }}</mm-format-text></h2>
                 </a>
 
+                <div ng-if="grade.itemname && !grade.link" class="item item-divider">
+                    <h2><mm-format-text watch="true">{{ grade.itemname }}</mm-format-text></h2>
+                </div>
+
                 <div ng-if="grade.weight" class="item item-text-wrap">
                     <h2>{{ 'mm.grades.weight' | translate}}</h2>
                     <p><mm-format-text watch="true">{{ grade.weight }}</mm-format-text></p>