diff --git a/src/plugins/trigger/trigger-command.c b/src/plugins/trigger/trigger-command.c
index 8491ea1fc..b663bb61e 100644
--- a/src/plugins/trigger/trigger-command.c
+++ b/src/plugins/trigger/trigger-command.c
@@ -1161,8 +1161,7 @@ trigger_command_trigger (const void *pointer, void *data,
                     }
                     else
                     {
-                        if (ptr_trigger)
-                            trigger_free (ptr_trigger);
+                        trigger_free (ptr_trigger);
                         ptr_trigger = trigger_new (
                             trigger_config_default_list[j][0],   /* name */
                             trigger_config_default_list[j][1],   /* enabled */
diff --git a/tests/unit/plugins/trigger/test-trigger.cpp b/tests/unit/plugins/trigger/test-trigger.cpp
index cc974051c..a0b77a020 100644
--- a/tests/unit/plugins/trigger/test-trigger.cpp
+++ b/tests/unit/plugins/trigger/test-trigger.cpp
@@ -629,7 +629,7 @@ TEST(Trigger, New)
     POINTERS_EQUAL(NULL, trigger_search_with_option (NULL));
     POINTERS_EQUAL(NULL, trigger_search_with_option (config_look_day_change));
 
-    /* invalid free */
+    /* test free of NULL trigger */
     trigger_free (NULL);
 }