diff --git a/refilc/lib/helpers/notification_helper.dart b/refilc/lib/helpers/notification_helper.dart
index 562463e..8daea82 100644
--- a/refilc/lib/helpers/notification_helper.dart
+++ b/refilc/lib/helpers/notification_helper.dart
@@ -134,27 +134,11 @@ class NotificationsHelper {
                   "title_grade".i18n,
                   "body_grade".i18n.fill(
                     [
+                      grade.value.value.toString(),
                       grade.subject.isRenamed &&
                               settingsProvider.renamedSubjectsEnabled
                           ? grade.subject.renamedTo!
-                          : grade.subject.name,
-                      grade.value.value.toString()
-                    ],
-                  ),
-                  notificationDetails,
-                  payload: "grades");
-            } else if (settingsProvider.gradeOpeningFun) { 
-              // if surprise grades are enabled, show a notification without the grade
-              await flutterLocalNotificationsPlugin.show(
-                  grade.id.hashCode,
-                  "title_grade".i18n,
-                  "body_grade_surprise".i18n.fill(
-                    [
-                      grade.subject.isRenamed &&
-                              settingsProvider.renamedSubjectsEnabled
-                          ? grade.subject.renamedTo!
-                          : grade.subject.name,
-                      grade.value.value.toString()
+                          : grade.subject.name
                     ],
                   ),
                   notificationDetails,
@@ -167,11 +151,11 @@ class NotificationsHelper {
                   "body_grade_multiuser".i18n.fill(
                     [
                       currentuserProvider.displayName!,
+                      grade.value.value.toString(),
                       grade.subject.isRenamed &&
                               settingsProvider.renamedSubjectsEnabled
                           ? grade.subject.renamedTo!
-                          : grade.subject.name,
-                      grade.value.value.toString()
+                          : grade.subject.name
                     ],
                   ),
                   notificationDetails,
diff --git a/refilc/lib/helpers/notification_helper.i18n.dart b/refilc/lib/helpers/notification_helper.i18n.dart
index a569290..f2d220b 100644
--- a/refilc/lib/helpers/notification_helper.i18n.dart
+++ b/refilc/lib/helpers/notification_helper.i18n.dart
@@ -8,7 +8,6 @@ extension Localization on String {
           "title_grade": "New grade",
           "body_grade": "%s: %s",
           "body_grade_multiuser": "(%s) %s: %s",
-          "body_grade_surprise": "Open the app to see your grade!",
           "title_absence": "Absence recorded",
           "body_absence": "An absence was recorded on %s for %s",
           "body_absence_multiuser": "An absence was recorded for %s on %s for the subject %s",
@@ -36,7 +35,7 @@ extension Localization on String {
           "title_grade": "Neue Note",
           "body_grade": "%s: %s",
           "body_grade_multiuser": "(%s) %s: %s",
-          "body_grade_surprise": "Öffnen Sie die App, um Ihre Note anzuzeigen!",
+          "body_grade_surprise": "Öffnen Sie die App, um Ihre Note anzuzeigen",
           "title_absence": "Abwesenheit aufgezeichnet",
           "body_absence": "Auf %s für %s wurde eine Abwesenheit aufgezeichnet",
           "body_absence_multiuser": "Für %s wurde am %s für das Thema Mathematik eine Abwesenheit aufgezeichnet",