diff --git a/src/socket/MessageBroker.js b/src/socket/MessageBroker.js
index e6feb61..7d96142 100644
--- a/src/socket/MessageBroker.js
+++ b/src/socket/MessageBroker.js
@@ -78,6 +78,7 @@ class MessageBroker extends SocketEvents {
       }
       if (!this.shards[message]) {
         console.log(`CLUSTER: Shard ${message} connected`);
+        this.shards[message] = Date.now();
         await this.subscriber.subscribe(
           message,
           (buffer) => this.onShardBinaryMessage(buffer, message),
@@ -85,6 +86,7 @@ class MessageBroker extends SocketEvents {
         );
         // immediately give new shards informations
         this.publisher.publish('bc', this.thisShard);
+        return;
       }
       this.shards[message] = Date.now();
       return;