diff --git a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
index 764a265..06702d4 100644
--- a/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
+++ b/src/main/java/hhn/labsw/bugageocaching/controller/Controller.java
@@ -516,6 +516,18 @@ public class Controller {
 
     Team team = (Team) getTeam.getBody();
 
+    int i = 0;
+
+    for (User_Info userInfo1 : user_infoRepository.findAll()) {
+      if (userInfo1.getTeam().equals(team)) {
+        i++;
+      }
+    }
+
+    if (i >= 10) {
+      return ResponseEntity.status(400).body("The team already has 10 members");
+    }
+
     user_info.setTeam(team);
 
     user_infoRepository.save(user_info);