diff --git a/src/channel/poll.js b/src/channel/poll.js
index 26a1ec3a..c181a7ab 100644
--- a/src/channel/poll.js
+++ b/src/channel/poll.js
@@ -79,7 +79,9 @@ PollModule.prototype.onUserPostJoin = function (user) {
     this.addUserToPollRoom(user);
     const self = this;
     user.on("effectiveRankChange", () => {
-        self.addUserToPollRoom(user);
+        if (self.channel && !self.channel.dead) {
+            self.addUserToPollRoom(user);
+        }
     });
 };