From 76edfe6c62c7ad49206813f2231ff79c4d99e2bb Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Mon, 7 Jun 2021 23:14:42 +0200 Subject: [PATCH] Fix deprecated value_template for MQTT light (#51587) --- homeassistant/components/mqtt/light/schema_basic.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/homeassistant/components/mqtt/light/schema_basic.py b/homeassistant/components/mqtt/light/schema_basic.py index 3e347363428..684dcf337aa 100644 --- a/homeassistant/components/mqtt/light/schema_basic.py +++ b/homeassistant/components/mqtt/light/schema_basic.py @@ -186,9 +186,6 @@ async def async_setup_entity_basic( hass, config, async_add_entities, config_entry, discovery_data=None ): """Set up a MQTT Light.""" - if CONF_STATE_VALUE_TEMPLATE not in config and CONF_VALUE_TEMPLATE in config: - config[CONF_STATE_VALUE_TEMPLATE] = config[CONF_VALUE_TEMPLATE] - async_add_entities([MqttLight(hass, config, config_entry, discovery_data)]) @@ -236,6 +233,9 @@ class MqttLight(MqttEntity, LightEntity, RestoreEntity): def _setup_from_config(self, config): """(Re)Setup the entity.""" + if CONF_STATE_VALUE_TEMPLATE not in config and CONF_VALUE_TEMPLATE in config: + config[CONF_STATE_VALUE_TEMPLATE] = config[CONF_VALUE_TEMPLATE] + topic = { key: config.get(key) for key in (