From de3f5e8d6934fa049e0941c5f2894befe666b125 Mon Sep 17 00:00:00 2001
From: Chris Talkington <chris@talkingtontech.com>
Date: Fri, 10 Apr 2020 17:23:07 -0500
Subject: [PATCH] Use zeroconf UUID if not available via IPP properties
 (#33991)

---
 homeassistant/components/ipp/config_flow.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/homeassistant/components/ipp/config_flow.py b/homeassistant/components/ipp/config_flow.py
index fe0808414ad..b7239c8bf49 100644
--- a/homeassistant/components/ipp/config_flow.py
+++ b/homeassistant/components/ipp/config_flow.py
@@ -116,7 +116,8 @@ class IPPFlowHandler(ConfigFlow, domain=DOMAIN):
             _LOGGER.exception("IPP Parse Error")
             return self.async_abort(reason="parse_error")
 
-        self.discovery_info[CONF_UUID] = info[CONF_UUID]
+        if info[CONF_UUID] is not None:
+            self.discovery_info[CONF_UUID] = info[CONF_UUID]
 
         await self.async_set_unique_id(self.discovery_info[CONF_UUID])
         self._abort_if_unique_id_configured(