diff --git a/src/channel/channel.js b/src/channel/channel.js
index e2e2940e..bde111e6 100644
--- a/src/channel/channel.js
+++ b/src/channel/channel.js
@@ -314,7 +314,9 @@ Channel.prototype.joinUser = function (user, data) {
                 } else {
                     user.account.channelRank = 0;
                     user.account.effectiveRank = user.account.globalRank;
-                    self.activeLock.release();
+                    if (self.activeLock) {
+                        self.activeLock.release();
+                    }
                 }
             });
         }