diff --git a/filcnaplo_kreta_api/lib/providers/grade_provider.dart b/filcnaplo_kreta_api/lib/providers/grade_provider.dart
index f15ef1c..ca2b44d 100644
--- a/filcnaplo_kreta_api/lib/providers/grade_provider.dart
+++ b/filcnaplo_kreta_api/lib/providers/grade_provider.dart
@@ -98,7 +98,10 @@ class GradeProvider with ChangeNotifier {
               .i18n;
       grade.value.shortName = _settings.goodStudent
           ? "Jeles".i18n
-          : '${grade.json!["SzovegesErtekelesRovidNev"]}'.i18n;
+          // If not null or - or contains "Nem" or contains "%"
+          : '${grade.json!["SzovegesErtekelesRovidNev"]}' != "null" && '${grade.json!["SzovegesErtekelesRovidNev"]}' != "-"
+              ? '${grade.json!["SzovegesErtekelesRovidNev"]}'.i18n
+              : grade.value.valueName;
     }
 
     notifyListeners();