diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index a9643d9..bdbe78c 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -673,16 +673,17 @@ public class Controller {
     // verlässt team
     user_info.setTeam(null);
 
-    int i = 0;
+    //int i = 0;
     // zählt teammitglieder
-    for (User_Info userInfo1 : user_infoRepository.findAll()) {
+    List<User_Info> user_infos = user_infoRepository.findByTeam(team);
+    /*for (User_Info userInfo1 : user_infoRepository.findAll()) {
       if (userInfo1.getTeam().equals(team)) {
         i++;
       }
-    }
+    }*/
 
     // löscht team, wenn keine teammitglieder mehr vorhanden
-    if (i == 0) {
+    if (user_infos.size() == 0) {
       teamRepository.delete(team);
     }