diff --git a/htmx-spring-boot/src/test/java/io/github/wimdeblauwe/htmx/spring/boot/mvc/HtmxResponseHandlerMethodReturnValueHandlerController.java b/htmx-spring-boot/src/test/java/io/github/wimdeblauwe/htmx/spring/boot/mvc/HtmxResponseHandlerMethodReturnValueHandlerController.java
index c4292f7c..308a6759 100644
--- a/htmx-spring-boot/src/test/java/io/github/wimdeblauwe/htmx/spring/boot/mvc/HtmxResponseHandlerMethodReturnValueHandlerController.java
+++ b/htmx-spring-boot/src/test/java/io/github/wimdeblauwe/htmx/spring/boot/mvc/HtmxResponseHandlerMethodReturnValueHandlerController.java
@@ -137,6 +137,14 @@ public void throwException() {
         throw new RuntimeException("Fake exception");
     }
 
+    @GetMapping("/argument")
+    public String argument(HtmxResponse.Builder htmxResponse) {
+        htmxResponse.trigger("event1");
+        return "argument";
+    }
+
+
+
     @ExceptionHandler(Exception.class)
     public HtmxResponse handleError(Exception ex) {
         return HtmxResponse.builder()
diff --git a/htmx-spring-boot/src/test/java/io/github/wimdeblauwe/htmx/spring/boot/mvc/HtmxResponseHandlerMethodReturnValueHandlerTest.java b/htmx-spring-boot/src/test/java/io/github/wimdeblauwe/htmx/spring/boot/mvc/HtmxResponseHandlerMethodReturnValueHandlerTest.java
index 099c554c..de6452a4 100644
--- a/htmx-spring-boot/src/test/java/io/github/wimdeblauwe/htmx/spring/boot/mvc/HtmxResponseHandlerMethodReturnValueHandlerTest.java
+++ b/htmx-spring-boot/src/test/java/io/github/wimdeblauwe/htmx/spring/boot/mvc/HtmxResponseHandlerMethodReturnValueHandlerTest.java
@@ -143,4 +143,11 @@ public void testException() throws Exception {
                                               <span>Fake exception</span>
                                           </span>""");
     }
+
+    @Test
+    public void testHxTriggerArgument() throws Exception {
+        mockMvc.perform(get("/hvhi/argument"))
+               .andExpect(status().isOk())
+               .andExpect(header().string("HX-Trigger", "event1"));
+    }
 }
diff --git a/htmx-spring-boot/src/test/resources/templates/argument.html b/htmx-spring-boot/src/test/resources/templates/argument.html
new file mode 100644
index 00000000..e69de29b