diff --git a/lib/channel.js b/lib/channel.js
index 03c7ed9c..293a6fc3 100644
--- a/lib/channel.js
+++ b/lib/channel.js
@@ -492,6 +492,7 @@ Channel.prototype.preJoin = function (user, password) {
                 }
 
                 user.socket.emit("rank", user.rank);
+                user.hasChannelRank = true;
                 user.emit("channelRank", user.rank);
 
                 if (self.permissions.seeplaylist > -1) {
diff --git a/lib/user.js b/lib/user.js
index 66eebb44..1e4ae11d 100644
--- a/lib/user.js
+++ b/lib/user.js
@@ -95,10 +95,6 @@ function User(socket) {
             self.initAdminCallbacks();
         }
     });
-
-    self.once("channelRank", function () {
-        self.hasChannelRank = true;
-    });
 }
 
 /**