diff --git a/backend/service/fetch/v2/fetcher.go b/backend/service/fetch/v2/fetcher.go
index 72320bf..f04d8c5 100644
--- a/backend/service/fetch/v2/fetcher.go
+++ b/backend/service/fetch/v2/fetcher.go
@@ -114,7 +114,7 @@ func parseEventForOneSemester(url string) ([]model.Event, error) {
 	events = generateUUIDs(events)
 	events = splitEventType(events)
 
-	events = switchNameAndNotesForPruefung(events)
+	events = switchNameAndNotesForExam(events)
 
 	var seminarGroup = model.SeminarGroup{
 		University: findFirstSpanWithClass(table, "header-1-0-0").FirstChild.Data,
@@ -128,11 +128,14 @@ func parseEventForOneSemester(url string) ([]model.Event, error) {
 	return events, nil
 }
 
-func switchNameAndNotesForPruefung(events []model.Event) []model.Event {
+// switch name and notes for Pruefung events when Note is not empty and Name starts with "Prüfungen" and contains email
+func switchNameAndNotesForExam(events []model.Event) []model.Event {
 	for i, event := range events {
 		if event.EventType == "Pruefung" {
-			events[i].Name = event.Notes
-			events[i].Notes = event.Name
+			if event.Notes != "" && strings.HasPrefix(event.Name, "Prüfungen") && strings.Contains(event.Name, "@") {
+				events[i].Name = event.Notes
+				events[i].Notes = event.Name
+			}
 		}
 	}
 	return events