diff --git a/src/util/FetchRecommendedShards.js b/src/util/FetchRecommendedShards.js
index a60f51006f99..217009077dd1 100644
--- a/src/util/FetchRecommendedShards.js
+++ b/src/util/FetchRecommendedShards.js
@@ -3,17 +3,18 @@ const botGateway = require('./Constants').Endpoints.botGateway;
 
 /**
  * Gets the recommended shard count from Discord
- * @param {number} token Discord auth token
+ * @param {string} token Discord auth token
+ * @param {number} [guildsPerShard=1000] Number of guilds per shard
  * @returns {Promise<number>} the recommended number of shards
  */
-module.exports = function fetchRecommendedShards(token) {
+module.exports = function fetchRecommendedShards(token, guildsPerShard = 1000) {
   return new Promise((resolve, reject) => {
     if (!token) throw new Error('A token must be provided.');
     superagent.get(botGateway)
       .set('Authorization', `Bot ${token.replace(/^Bot\s*/i, '')}`)
       .end((err, res) => {
         if (err) reject(err);
-        resolve(res.body.shards);
+        resolve(res.body.shards * (1000 / guildsPerShard));
       });
   });
 };