diff --git a/user.js b/user.js
index 64315a8a..8dec1941 100644
--- a/user.js
+++ b/user.js
@@ -85,6 +85,8 @@ User.prototype.setAFK = function (afk) {
         return;
     var chan = this.channel;
     this.meta.afk = afk;
+    if(!afk)
+        this.autoAFK();
     if(this.meta.afk)
         chan.afkcount++;
     else