diff --git a/etc/icinga2/conf.d/commands.conf b/etc/icinga2/conf.d/commands.conf
index 5e1035018..29f86210a 100644
--- a/etc/icinga2/conf.d/commands.conf
+++ b/etc/icinga2/conf.d/commands.conf
@@ -43,9 +43,7 @@ object NotificationCommand "mail-host-notification" {
       required = true
       value = "$notification_hoststate$"
     }
-    "-X" = {
-      required = false
-      value = "$notification_hostnotes$"
+    "-X" = "$notification_hostnotes$"
     "-t" = {
       required = true
       value = "$notification_type$"
@@ -114,14 +112,8 @@ object NotificationCommand "mail-service-notification" {
       required = true
       value = "$notification_type$"
     }
-    "-X" = {
-      required = false
-      value = "$notification_hostnotes$"
-    }
-    "-x" = {
-      required = false
-      value = "$notification_servicenotes$"
-    }
+    "-X" = "$notification_hostnotes$"
+    "-x" = "$notification_servicenotes$"
     "-u" = {
       required = true
       value = "$notification_servicedisplayname$"