diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 89a1f7d..37604d1 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -367,7 +367,7 @@ public class Controller {
         }
       }*/
       List<Bearbeitet> bearbeitetList = bearbeitetRepository.findByUser(user);
-      logger.debug("/api/getMyCaches Got all bearbeitet entreis of user: " +user.getEmail());
+      logger.debug("/api/getMyCaches Got all bearbeitet entreis of user: " + user.getEmail());
       return ResponseEntity.status(200).body(new Gson().toJson(bearbeitetList));
     } else {
       return ResponseEntity.status(404).body("Es gab einen Fehler. Bitte versuche es erneut oder kontaktiere einen Admin!");
@@ -660,6 +660,10 @@ public class Controller {
 
     // löscht team, wenn keine teammitglieder mehr vorhanden
     if (user_infos.size() == 0) {
+      List<TeamInvite> teamInvites = teamInviteRepository.findByTeam(team);
+      for (TeamInvite teamInvite : teamInvites) {
+        teamInviteRepository.delete(teamInvite);
+      }
       teamRepository.delete(team);
     }
 
diff --git a/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java b/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java
index 0031632..154cd3d 100644
--- a/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java
+++ b/src/main/java/hhn/labsw/bugageocaching/repositories/TeamInviteRepository.java
@@ -11,4 +11,5 @@ import java.util.List;
 public interface TeamInviteRepository extends JpaRepository<TeamInvite, Integer> {
   TeamInvite findByUserAndTeam(User user, Team team);
   List<TeamInvite> findByUser(User user);
+  List<TeamInvite> findByTeam(Team team);
 }