diff --git a/houdini/cooldown.py b/houdini/cooldown.py
index 6b95797..13bee69 100644
--- a/houdini/cooldown.py
+++ b/houdini/cooldown.py
@@ -67,7 +67,7 @@ class _CooldownMapping:
 
     def _get_bucket_key(self, p):
         if self._cooldown.bucket_type == BucketType.Default:
-            return p
+            return p.id
         return p.server
 
     def _verify_cache_integrity(self):
diff --git a/houdini/data/room.py b/houdini/data/room.py
index 028d624..dd92e12 100644
--- a/houdini/data/room.py
+++ b/houdini/data/room.py
@@ -96,6 +96,8 @@ class PenguinBackyardRoom(RoomMixin):
         await p.send_xt('jr', self.id, await p.string)
 
     async def remove_penguin(self, p):
+        self.penguin = None
+
         p.room = None
         p.frame = 1
         p.toy = None