diff --git a/homeassistant/components/daikin/config_flow.py b/homeassistant/components/daikin/config_flow.py
index f999a5376b1..5f2a8a0c0b1 100644
--- a/homeassistant/components/daikin/config_flow.py
+++ b/homeassistant/components/daikin/config_flow.py
@@ -11,7 +11,7 @@ import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.const import CONF_HOST, CONF_PASSWORD
 
-from .const import CONF_KEY, CONF_UUID, KEY_IP, KEY_MAC, TIMEOUT
+from .const import CONF_KEY, CONF_UUID, KEY_HOSTNAME, KEY_IP, KEY_MAC, TIMEOUT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -128,7 +128,7 @@ class FlowHandler(config_entries.ConfigFlow):
     async def async_step_zeroconf(self, discovery_info):
         """Prepare configuration for a discovered Daikin device."""
         _LOGGER.debug("Zeroconf discovery_info: %s", discovery_info)
-        await self.async_set_unique_id(discovery_info.get(CONF_HOST))
+        await self.async_set_unique_id(discovery_info[KEY_HOSTNAME])
         self._abort_if_unique_id_configured()
-        self.host = discovery_info.get(CONF_HOST)
+        self.host = discovery_info[CONF_HOST]
         return await self.async_step_user()
diff --git a/homeassistant/components/daikin/const.py b/homeassistant/components/daikin/const.py
index 30d34b898d3..3e24325e5b1 100644
--- a/homeassistant/components/daikin/const.py
+++ b/homeassistant/components/daikin/const.py
@@ -64,5 +64,6 @@ CONF_UUID = "uuid"
 
 KEY_MAC = "mac"
 KEY_IP = "ip"
+KEY_HOSTNAME = "hostname"
 
 TIMEOUT = 60
diff --git a/tests/components/daikin/test_config_flow.py b/tests/components/daikin/test_config_flow.py
index 989064afe6c..67affc3d501 100644
--- a/tests/components/daikin/test_config_flow.py
+++ b/tests/components/daikin/test_config_flow.py
@@ -6,7 +6,7 @@ from aiohttp import ClientError
 from aiohttp.web_exceptions import HTTPForbidden
 import pytest
 
-from homeassistant.components.daikin.const import KEY_IP, KEY_MAC
+from homeassistant.components.daikin.const import KEY_HOSTNAME, KEY_IP, KEY_MAC
 from homeassistant.config_entries import (
     SOURCE_DISCOVERY,
     SOURCE_IMPORT,
@@ -112,7 +112,11 @@ async def test_device_abort(hass, mock_daikin, s_effect, reason):
     "source, data, unique_id",
     [
         (SOURCE_DISCOVERY, {KEY_IP: HOST, KEY_MAC: MAC}, MAC),
-        (SOURCE_ZEROCONF, {CONF_HOST: HOST}, HOST),
+        (
+            SOURCE_ZEROCONF,
+            {CONF_HOST: HOST, KEY_HOSTNAME: "DaikinUNIQE.local"},
+            "DaikinUNIQE.local",
+        ),
     ],
 )
 async def test_discovery_zeroconf(hass, mock_daikin, source, data, unique_id):