diff --git a/src/client/Client.js b/src/client/Client.js
index 6a06facd9..907f3e033 100644
--- a/src/client/Client.js
+++ b/src/client/Client.js
@@ -249,9 +249,6 @@ class Client extends EventEmitter {
     for (const i of this._intervals) clearInterval(i);
     this._timeouts.clear();
     this._intervals.clear();
-    this.token = null;
-    this.email = null;
-    this.password = null;
     return this.manager.destroy();
   }
 
diff --git a/src/client/ClientManager.js b/src/client/ClientManager.js
index 6e5ea5159..01f664b0e 100644
--- a/src/client/ClientManager.js
+++ b/src/client/ClientManager.js
@@ -59,14 +59,15 @@ class ClientManager {
   }
 
   destroy() {
-    return new Promise(resolve => {
-      this.client.ws.destroy();
-      if (!this.client.user.bot) {
-        resolve(this.client.rest.methods.logout());
-      } else {
-        resolve();
-      }
-    });
+    this.client.ws.destroy();
+    if (this.client.user.bot) {
+      this.client.token = null;
+      return Promise.resolve();
+    } else {
+      return this.client.rest.methods.logout().then(() => {
+        this.client.token = null;
+      });
+    }
   }
 }