diff --git a/src/structure/components/observers/CommandHandler.js b/src/structure/components/observers/CommandHandler.js
index 0287d6e..c52931c 100644
--- a/src/structure/components/observers/CommandHandler.js
+++ b/src/structure/components/observers/CommandHandler.js
@@ -10,8 +10,6 @@ class CommandHandler extends Observer {
             guarded: true
         });
 
-        this.client = client;
-
         this.hooks = [
             ['messageCreate', this.messageCreate.bind(this)],
             ['interactionCreate', this.interactionCreate.bind(this)]
diff --git a/src/structure/interfaces/Component.js b/src/structure/interfaces/Component.js
index 5e5ec41..8586112 100644
--- a/src/structure/interfaces/Component.js
+++ b/src/structure/interfaces/Component.js
@@ -3,6 +3,8 @@ class Component {
     constructor(client, options = {}) {
         if(!options) return null;
 
+        this.client = client;
+
         this.id = options.id; //Name of the component
         this._type = options._type; //Type of component (command, observer, etc.)