diff --git a/src/commands/default/comms.py b/src/commands/default/comms.py
index b69d898f6e..3c4a8f6e2c 100644
--- a/src/commands/default/comms.py
+++ b/src/commands/default/comms.py
@@ -153,8 +153,8 @@ class CmdDelCom(MuxPlayerCommand):
                 return
             chkey = channel.key.lower()
             # find all nicks linked to this channel and delete them
-            for nick in [nick for nick in caller.nicks.get(category="channel")
-                         if nick.strvalue.lower() == chkey]:
+            for nick in [nick for nick in make_iter(caller.nicks.get(category="channel", return_obj=True))
+                         if nick and nick.strvalue.lower() == chkey]:
                 nick.delete()
             disconnect = channel.disconnect(player)
             if disconnect:
diff --git a/src/comms/models.py b/src/comms/models.py
index f37d7c5057..a56c665ad5 100644
--- a/src/comms/models.py
+++ b/src/comms/models.py
@@ -411,7 +411,7 @@ class ChannelDB(TypedObject):
         if not disconnect:
             return False
         # disconnect
-        self.db_subscriptions.remove(player)
+        self.db_subscriptions.remove(player.dbobj)
         # post-disconnect hook
         self.typeclass.post_leave_channel(player.dbobj)
         return True