diff --git a/lib/channel.js b/lib/channel.js
index 698896d0..ec3c2914 100644
--- a/lib/channel.js
+++ b/lib/channel.js
@@ -467,8 +467,16 @@ Channel.prototype.getIPRank = function (ip, callback) {
 Channel.prototype.preJoin = function (user, password) {
     var self = this;
     self.whenReady(function () {
+        if (self.dead) {
+            return;
+        }
+
         user.whenLoggedIn(function () {
             self.getRank(user.name, function (err, rank) {
+                if (self.dead) {
+                    return;
+                }
+
                 if (err) {
                     user.rank = user.global_rank;
                 } else {