diff --git a/custom_components/hdhomerun/config_flow.py b/custom_components/hdhomerun/config_flow.py
index c03d4c4..cf33243 100644
--- a/custom_components/hdhomerun/config_flow.py
+++ b/custom_components/hdhomerun/config_flow.py
@@ -350,15 +350,17 @@ async def async_step_ssdp(
 
         # region #-- get the important information --#
         self._friendly_name = (
-            f"{discovery_info.upnp.get('modelName', '')} "
-            f"{discovery_info.upnp.get('serialNumber', '')}"
+            f"{discovery_info.upnp.get(ssdp.ATTR_UPNP_MODEL_NAME, '')} "
+            f"{discovery_info.upnp.get(ssdp.ATTR_UPNP_SERIAL, '')}"
+        )
+        service_list = discovery_info.upnp.get(ssdp.ATTR_UPNP_SERVICE_LIST, {}).get(
+            "service"
         )
-        service_list = discovery_info.upnp.get("serviceList", {}).get("service")
         if service_list:
             _LOGGER.debug(self.format("%s"), json.dumps(service_list))
             service = service_list[0]
             self._host = urlparse(url=service.get("controlURL", "")).hostname
-        serial: str = discovery_info.upnp.get("serialNumber", "")
+        serial: str = discovery_info.upnp.get(ssdp.ATTR_UPNP_SERIAL, "")
         # endregion
 
         # region #-- set a unique_id, update details if device has changed IP --#