diff --git a/lib/generators/nexus_cqrs/command_generator.rb b/lib/generators/nexus_cqrs/command_generator.rb
index 18a565eca88a867aefca17f82a2150eb0715655a..a18309e99c196f1a650c991aa805b4fe00352ce4 100644
--- a/lib/generators/nexus_cqrs/command_generator.rb
+++ b/lib/generators/nexus_cqrs/command_generator.rb
@@ -22,7 +22,7 @@ module NexusCqrs
         template('register_cqrs_handlers.rb', handler_config)
       end
 
-      code_to_inject = "$COMMAND_EXECUTOR.register_command(#{full_name}, #{full_name}Handler)"
+      code_to_inject = "$COMMAND_EXECUTOR.register_command(#{full_name}, #{full_name}Handler.new)\n"
 
       inject_into_file(handler_config, code_to_inject, after: "# Register Commands\n")
     end
diff --git a/lib/generators/nexus_cqrs/query_generator.rb b/lib/generators/nexus_cqrs/query_generator.rb
index 348607768c193f4b302db3d0afe338cc5a12102a..d83e476b970334460903521d075b59c02fc1c65a 100644
--- a/lib/generators/nexus_cqrs/query_generator.rb
+++ b/lib/generators/nexus_cqrs/query_generator.rb
@@ -22,7 +22,7 @@ module NexusCqrs
         template('register_cqrs_handlers.rb', handler_config)
       end
 
-      code_to_inject = "$QUERY_EXECUTOR.register_command(#{full_name}, #{full_name}Handler)"
+      code_to_inject = "$QUERY_EXECUTOR.register_command(#{full_name}, #{full_name}Handler.new)\n"
 
       inject_into_file(handler_config, code_to_inject, after: "# Register Queries\n")
     end
diff --git a/spec/lib/generators/command_generator_spec.rb b/spec/lib/generators/command_generator_spec.rb
index 6a32fcf8e1aefee9f91cf2fe05a2b7cbbc63c8c5..874a4c0301256bb730ddc7b786523f36685c70fe 100644
--- a/spec/lib/generators/command_generator_spec.rb
+++ b/spec/lib/generators/command_generator_spec.rb
@@ -16,7 +16,7 @@ describe NexusCqrs::CommandGenerator, type: :generator do
   end
 
   it "creates the registration config file for handlers" do
-    line = "$COMMAND_EXECUTOR.register_command(TestCommand, TestCommandHandler)"
+    line = "$COMMAND_EXECUTOR.register_command(TestCommand, TestCommandHandler.new)"
     base_path = File.expand_path("../../tmp", __FILE__)
     expect(File.read(base_path + "/config/initializers/register_cqrs_handlers.rb")).to(include(line))
   end
@@ -34,7 +34,7 @@ describe NexusCqrs::CommandGenerator, type: :generator do
     end
 
     it "creates the registration config file for handlers" do
-      line = "$COMMAND_EXECUTOR.register_command(Test::TestCommand, Test::TestCommandHandler)"
+      line = "$COMMAND_EXECUTOR.register_command(Test::TestCommand, Test::TestCommandHandler.new)"
       base_path = File.expand_path("../../tmp", __FILE__)
       expect(File.read(base_path + "/config/initializers/register_cqrs_handlers.rb")).to(include(line))
     end
diff --git a/spec/lib/generators/query_generator_spec.rb b/spec/lib/generators/query_generator_spec.rb
index 3022312d7f4f8d820a4e9d3850081994fe09eb1a..05e3294da84fa4ccaf6c4dca8f4b743ddbe1a681 100644
--- a/spec/lib/generators/query_generator_spec.rb
+++ b/spec/lib/generators/query_generator_spec.rb
@@ -16,7 +16,7 @@ describe NexusCqrs::QueryGenerator, type: :generator do
   end
 
   it "creates the registration config file for handlers" do
-    line = "$QUERY_EXECUTOR.register_command(TestQuery, TestQueryHandler)"
+    line = "$QUERY_EXECUTOR.register_command(TestQuery, TestQueryHandler.new)"
     base_path = File.expand_path("../../tmp", __FILE__)
     expect(File.read(base_path + "/config/initializers/register_cqrs_handlers.rb")).to(include(line))
   end
@@ -34,7 +34,7 @@ describe NexusCqrs::QueryGenerator, type: :generator do
     end
 
     it "creates the registration config file for handlers" do
-      line = "$QUERY_EXECUTOR.register_command(Test::TestQuery, Test::TestQueryHandler)"
+      line = "$QUERY_EXECUTOR.register_command(Test::TestQuery, Test::TestQueryHandler.new)"
       base_path = File.expand_path("../../tmp", __FILE__)
       expect(File.read(base_path + "/config/initializers/register_cqrs_handlers.rb")).to(include(line))
     end