diff --git a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/ComponentSwitch.java b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/ComponentSwitch.java
index 5f4e6ce1b7184..bdf753ab3dd68 100644
--- a/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/ComponentSwitch.java
+++ b/bundles/org.openhab.binding.mqtt.homeassistant/src/main/java/org/openhab/binding/mqtt/homeassistant/internal/ComponentSwitch.java
@@ -37,11 +37,11 @@ static class ChannelConfiguration extends BaseChannelConfiguration {
         protected boolean optimistic = false;
 
         protected String state_topic = "";
-        protected String state_on = "true";
-        protected String state_off = "false";
+        protected String state_on = "ON";
+        protected String state_off = "OFF";
         protected @Nullable String command_topic;
-        protected String payload_on = "true";
-        protected String payload_off = "false";
+        protected String payload_on = "ON";
+        protected String payload_off = "OFF";
     }
 
     public ComponentSwitch(CFactory.ComponentConfiguration componentConfiguration) {