diff --git a/obj/team.c b/obj/team.c
index cb2356a..0319f5e 100644
--- a/obj/team.c
+++ b/obj/team.c
@@ -938,15 +938,19 @@
   DoRemoveMember(caster);
 }
 
-// Teams mit nur einem Living loesen sich auf.
 private void RemoveSingles() {
-  object *obs=Members();
-  if (sizeof(obs) <= 1)
-  {
-    gtell("Das Team loest sich auf.\n");
-    RemoveMemberAndAssocs(obs[0]);
-    TryRemove();
-  }
+  object *obs;
+  mixed aso;
+
+  if (!IsMember(leader)) return;
+  if (!query_once_interactive(leader)) return; // NPC Team
+  obs=Members()-({leader});
+  if (pointerp(aso=assoc_mem[leader]))
+    obs-=aso;
+  if (sizeof(obs)) return;
+  gtell("Das Team loest sich auf.\n");
+  RemoveMemberAndAssocs(leader);
+  TryRemove();
 }
 
 int RemoveMember(mixed arg) {