diff --git a/lib/screen/pages/more/gradeAverages/gradeAverage.dart b/lib/screen/pages/more/gradeAverages/gradeAverage.dart
index 05d8f00..f5dc469 100644
--- a/lib/screen/pages/more/gradeAverages/gradeAverage.dart
+++ b/lib/screen/pages/more/gradeAverages/gradeAverage.dart
@@ -64,25 +64,32 @@ class _GradeAverageState extends State<GradeAverage> {
             )).toList(),
 
             onSelected: (e) {
-              showDialog(context: context, builder: (context) {
-                return AlertDialog(
-                  title: const Text("Notensystem wechseln"),
-                  content: const Text("Beim wechsel des Notensystems werden alle Einträge zurückgesetzt."),
-                  actions: [
-                    TextButton(onPressed: () {
-                      Navigator.of(context).pop();
-                    }, child: const Text("Abbrechen")),
-                    TextButton(onPressed: () {
-                      setState(() {
-                        grades.clear();
-                        gradeSystem = e;
-                      });
-                      Navigator.of(context).pop();
-                    }, child: const Text("Fortfahren")),
-                  ],
-                );
+              void switchSystem() => setState(() {
+                grades.clear();
+                gradeSystem = e;
               });
 
+              if(grades.isNotEmpty) {
+                showDialog(context: context, builder: (context) {
+                  return AlertDialog(
+                    title: const Text("Notensystem wechseln"),
+                    content: const Text("Beim wechsel des Notensystems werden alle Einträge zurückgesetzt."),
+                    actions: [
+                      TextButton(onPressed: () {
+                        Navigator.of(context).pop();
+                      }, child: const Text("Abbrechen")),
+                      TextButton(onPressed: () {
+                        switchSystem();
+                        Navigator.of(context).pop();
+                      }, child: const Text("Fortfahren")),
+                    ],
+                  );
+                });
+              } else {
+                switchSystem();
+              }
+
+
             },
           ),
         ],