diff --git a/homeassistant/components/sql/sensor.py b/homeassistant/components/sql/sensor.py
index 0b32b10f972..dffb45bfd93 100644
--- a/homeassistant/components/sql/sensor.py
+++ b/homeassistant/components/sql/sensor.py
@@ -321,13 +321,12 @@ class SQLSensor(ManualTriggerSensorEntity):
         self._attr_extra_state_attributes = {}
         self._use_database_executor = use_database_executor
         self._lambda_stmt = _generate_lambda_stmt(query)
-        if not yaml:
+        if not yaml and (unique_id := trigger_entity_config.get(CONF_UNIQUE_ID)):
             self._attr_name = None
             self._attr_has_entity_name = True
-        if not yaml and trigger_entity_config.get(CONF_UNIQUE_ID):
             self._attr_device_info = DeviceInfo(
                 entry_type=DeviceEntryType.SERVICE,
-                identifiers={(DOMAIN, trigger_entity_config[CONF_UNIQUE_ID])},
+                identifiers={(DOMAIN, unique_id)},
                 manufacturer="SQL",
                 name=self.name,
             )