diff --git a/modules/source/source.py b/modules/source/source.py
index 6b6b67f..b71a5d2 100644
--- a/modules/source/source.py
+++ b/modules/source/source.py
@@ -209,9 +209,10 @@ def transitionGoneUser(self, mumble_server, old, new, sid):
         assert(old)
         
         self.users.remove(sid, old.state.session)
-        self.removeFromGroups(mumble_server, old.state.session, old.game, old.server, old.identity["team"])
         
         if new:
+            self.removeFromGroups(mumble_server, old.state.session, old.game, old.server, old.identity["team"])
+            
             bcid = self.cfg().source.basechannelid
             self.dlog(sid, old.state, "User stopped playing. Moving to %d.", bcid)
             self.moveUserToCid(mumble_server, new.state, bcid)