diff --git a/hatasmota/sensor.py b/hatasmota/sensor.py
index 9761a49..d2fb396 100644
--- a/hatasmota/sensor.py
+++ b/hatasmota/sensor.py
@@ -186,14 +186,14 @@ def from_discovery_message(
             friendly_name=f"{device_config[CONF_DEVICENAME]} {sensor_name}",
             mac=device_config[CONF_MAC],
             platform=platform,
-            poll_payload="8",
+            poll_payload="10",
             poll_topic=get_topic_command_status(device_config),
             availability_topic=get_topic_tele_will(device_config),
             availability_offline=config_get_state_offline(device_config),
             availability_online=config_get_state_online(device_config),
             quantity=quantity,
             state_topic1=get_topic_tele_sensor(device_config),
-            state_topic2=get_topic_stat_status(device_config, 8),
+            state_topic2=get_topic_stat_status(device_config, 10),
             unit=unit,
             value_path=value_path,
         )
diff --git a/hatasmota/switch.py b/hatasmota/switch.py
index 9c9a778..776b2a5 100644
--- a/hatasmota/switch.py
+++ b/hatasmota/switch.py
@@ -246,7 +246,7 @@ def from_discovery_message(cls, config, idx, platform):
             friendly_name=config_get_friendlyname(config, platform, idx),
             mac=config[CONF_MAC],
             platform=platform,
-            poll_payload="8",
+            poll_payload="10",
             poll_topic=get_topic_command_status(config),
             availability_topic=get_topic_tele_will(config),
             availability_offline=config_get_state_offline(config),
@@ -256,7 +256,7 @@ def from_discovery_message(cls, config, idx, platform):
             state_power_on=config_get_state_power_on(config),
             state_topic1=get_topic_stat_result(config),
             state_topic2=get_topic_tele_sensor(config),
-            state_topic3=get_topic_stat_status(config, 8),
+            state_topic3=get_topic_stat_status(config, 10),
             switchname=config_get_switchname(config, idx),
         )