diff --git a/src/client/client.ts b/src/client/client.ts
index 7e7ecd6..d222fc9 100644
--- a/src/client/client.ts
+++ b/src/client/client.ts
@@ -171,12 +171,13 @@ export class Client<Ready extends boolean = boolean> extends BaseClient {
 			}
 			//rest of the events
 			default: {
-				await this.events?.execute(packet.t as never, packet, this as Client<true>, shardId);
 				switch (packet.t) {
 					case 'INTERACTION_CREATE':
+						await this.events?.execute(packet.t as never, packet, this as Client<true>, shardId);
 						await this.handleCommand.interaction(packet.d, shardId);
 						break;
 					case 'MESSAGE_CREATE':
+						await this.events?.execute(packet.t as never, packet, this as Client<true>, shardId);
 						await this.handleCommand.message(packet.d, shardId);
 						break;
 					case 'READY':
@@ -184,6 +185,7 @@ export class Client<Ready extends boolean = boolean> extends BaseClient {
 						for (const g of packet.d.guilds) {
 							this.__handleGuilds.add(g.id);
 						}
+						await this.events?.execute(packet.t as never, packet, this as Client<true>, shardId);
 						this.botId = packet.d.user.id;
 						this.applicationId = packet.d.application.id;
 						this.me = Transformers.ClientUser(this, packet.d.user, packet.d.application) as never;
@@ -200,6 +202,9 @@ export class Client<Ready extends boolean = boolean> extends BaseClient {
 						}
 						this.debugger?.debug(`#${shardId}[${packet.d.user.username}](${this.botId}) is online...`);
 						break;
+					default:
+						await this.events?.execute(packet.t as never, packet, this as Client<true>, shardId);
+						break;
 				}
 				break;
 			}
diff --git a/src/client/workerclient.ts b/src/client/workerclient.ts
index 0a1bf54..fe6d136 100644
--- a/src/client/workerclient.ts
+++ b/src/client/workerclient.ts
@@ -380,12 +380,13 @@ export class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
 				break;
 			}
 			default: {
-				await this.events?.execute(packet.t as never, packet, this, shardId);
 				switch (packet.t) {
 					case 'INTERACTION_CREATE':
+						await this.events?.execute(packet.t as never, packet, this, shardId);
 						await this.handleCommand.interaction(packet.d, shardId);
 						break;
 					case 'MESSAGE_CREATE':
+						await this.events?.execute(packet.t as never, packet, this, shardId);
 						await this.handleCommand.message(packet.d, shardId);
 						break;
 					case 'READY':
@@ -393,6 +394,7 @@ export class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
 						for (const g of packet.d.guilds) {
 							this.__handleGuilds.add(g.id);
 						}
+						await this.events?.execute(packet.t as never, packet, this, shardId);
 						this.botId = packet.d.user.id;
 						this.applicationId = packet.d.application.id;
 						this.me = Transformers.ClientUser(this, packet.d.user, packet.d.application) as never;
@@ -412,6 +414,9 @@ export class WorkerClient<Ready extends boolean = boolean> extends BaseClient {
 						}
 						this.debugger?.debug(`#${shardId}[${packet.d.user.username}](${this.botId}) is online...`);
 						break;
+					default:
+						await this.events?.execute(packet.t as never, packet, this, shardId);
+						break;
 				}
 				break;
 			}