diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 2bee0ce..3903591 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -706,6 +706,8 @@ public class Controller {
     // verlässt team
     user_info.setTeam(null);
 
+    user_infoRepository.save(user_info);
+
     //int i = 0;
     // zählt teammitglieder
     List<User_Info> user_infos = user_infoRepository.findByTeam(team);
@@ -720,8 +722,6 @@ public class Controller {
       teamRepository.delete(team);
     }
 
-    user_infoRepository.save(user_info);
-
     return ResponseEntity.status(200).body("Ok");
   }