diff --git a/p/daemon/channeld.c b/p/daemon/channeld.c
index 0c37553..db1e1d7 100644
--- a/p/daemon/channeld.c
+++ b/p/daemon/channeld.c
@@ -908,7 +908,8 @@
     // Kontrolle an jemand anderen uebergeben, wenn der Ebenensupervisor
     // diese verlassen hat. change_sv_object() waehlt per Default den
     // aeltesten Zuhoerer.
-    if (pl == channels[ch][I_SUPERVISOR])
+    if (pl == channels[ch][I_SUPERVISOR]
+        || object_name(pl) == channels[ch][I_SUPERVISOR])
     {
       change_sv_object(ch, pl, 0);
     }