diff --git a/src/client/Client.js b/src/client/Client.js
index d55b2d88e..99da4996a 100644
--- a/src/client/Client.js
+++ b/src/client/Client.js
@@ -104,13 +104,13 @@ class Client extends BaseClient {
     this.presence = new ClientPresence(this);
 
     Object.defineProperty(this, 'token', { writable: true });
-    if (!browser && !this.token && 'CLIENT_TOKEN' in process.env) {
+    if (!browser && !this.token && 'DISCORD_TOKEN' in process.env) {
       /**
        * Authorization token for the logged in bot
        * <warn>This should be kept private at all times.</warn>
        * @type {?string}
        */
-      this.token = process.env.CLIENT_TOKEN;
+      this.token = process.env.DISCORD_TOKEN;
     } else {
       this.token = null;
     }
diff --git a/src/sharding/ShardingManager.js b/src/sharding/ShardingManager.js
index 2b96ab2dd..bbec15b67 100644
--- a/src/sharding/ShardingManager.js
+++ b/src/sharding/ShardingManager.js
@@ -31,7 +31,7 @@ class ShardingManager extends EventEmitter {
       totalShards: 'auto',
       respawn: true,
       shardArgs: [],
-      token: null,
+      token: process.env.DISCORD_TOKEN,
     }, options);
 
     /**