diff --git a/src/client/Client.js b/src/client/Client.js
index 7e313495e..368ef6c7c 100644
--- a/src/client/Client.js
+++ b/src/client/Client.js
@@ -27,11 +27,11 @@ class Client extends EventEmitter {
      */
     this.options = mergeDefault(Constants.DefaultOptions, options);
 
-    if (!this.options.shard_id && process.env.hasOwnProperty('SHARD_ID')) {
+    if (!this.options.shard_id && 'SHARD_ID' in process.env) {
       this.options.shard_id = process.env.SHARD_ID;
     }
 
-    if (!this.options.shard_count && process.env.hasOwnProperty('SHARD_COUNT')) {
+    if (!this.options.shard_count && 'SHARD_COUNT' in process.env) {
       this.options.shard_count = process.env.SHARD_COUNT;
     }
 
diff --git a/src/sharding/Shard.js b/src/sharding/Shard.js
index f7333e630..85321fbb0 100644
--- a/src/sharding/Shard.js
+++ b/src/sharding/Shard.js
@@ -28,7 +28,8 @@ class Shard {
      */
     this.process = childProcess.fork(path.resolve(this.manager.file), [], {
       env: {
-        SHARD_ID: this.id, SHARD_COUNT: this.manager.totalShards,
+        SHARD_ID: this.id,
+        SHARD_COUNT: this.manager.totalShards,
       },
     });