diff --git a/lib/aethyr/core/commands/command_handler.rb b/lib/aethyr/core/commands/command_handler.rb
index 8f3a97da4e092b3546b08646ee3e9bff8d33fbbb..c95e50f9450bc49bfe15bd272ae9bee88d54d5b8 100644
--- a/lib/aethyr/core/commands/command_handler.rb
+++ b/lib/aethyr/core/commands/command_handler.rb
@@ -6,7 +6,7 @@ module Aethyr
     class InputHandler
       attr_reader :player
 
-      def initialize(player, *args)
+      def initialize(player, *args, **kwargs)
         super()
         @player = player
       end
@@ -19,8 +19,8 @@ module Aethyr
     class CommandHandler < InputHandler
       include Aethyr::Extend::HandleHelp
 
-      def initialize(player, commands, *args, help_entries: [])
-        super(player, commands, *args, help_entries: help_entries)
+      def initialize(player, commands, *args, help_entries: [], **kwargs)
+        super(player, commands, *args, help_entries: help_entries, **kwargs)
       end
 
       protected
diff --git a/lib/aethyr/core/commands/emotes/emote_handler.rb b/lib/aethyr/core/commands/emotes/emote_handler.rb
index d40e8a22fe1cfc52141523a97ff57dc97f732cb6..041022e4aaa066e139faa68b17587ab8b22d1d8f 100644
--- a/lib/aethyr/core/commands/emotes/emote_handler.rb
+++ b/lib/aethyr/core/commands/emotes/emote_handler.rb
@@ -3,8 +3,8 @@ require 'aethyr/core/commands/command_handler'
 module Aethyr
   module Extend
     class EmoteHandler < CommandHandler
-      def initialize(player, commands, *args)
-        super(player, commands, *args)
+      def initialize(player, commands, *args, **kwargs)
+        super(player, commands, *args, **kwargs)
       end
 
       protected
diff --git a/lib/aethyr/core/commands/help_handler.rb b/lib/aethyr/core/commands/help_handler.rb
index 16f579d1945360dc368fead0430ad3675dc8a6a9..6ed8fbff71c0755bee44ab18c987479a38c91f85 100644
--- a/lib/aethyr/core/commands/help_handler.rb
+++ b/lib/aethyr/core/commands/help_handler.rb
@@ -5,8 +5,8 @@ module Aethyr
     module HandleHelp
       attr_reader :commands
 
-      def initialize(player, commands, *args, help_entries: [])
-        super(player, *args)
+      def initialize(player, commands, *args, help_entries: [], **kwargs)
+        super(player, *args, **kwargs)
 
         @commands = commands
 
@@ -23,7 +23,7 @@ module Aethyr
     class HelpEntryHandler
       include Aethyr::Extend::HandleHelp
 
-      def initialize(player, commands, *args, help_entries: [])
+      def initialize(player, commands, *args, help_entries: [], **kwargs)
         super
       end
     end