diff --git a/script/scaffold/templates/config_flow_helper/integration/__init__.py b/script/scaffold/templates/config_flow_helper/integration/__init__.py
index 9b4d4097036..2ad917394b9 100644
--- a/script/scaffold/templates/config_flow_helper/integration/__init__.py
+++ b/script/scaffold/templates/config_flow_helper/integration/__init__.py
@@ -11,7 +11,7 @@ from .const import DOMAIN
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up NEW_NAME from a config entry."""
     # TODO Optionally store an object for your platforms to access
-    # hass.data[DOMAIN][entry.entry_id] = ...
+    # hass.data.setdefault(DOMAIN, {})[entry.entry_id] = ...
 
     # TODO Optionally validate config entry options before setting up platform
 
diff --git a/script/scaffold/templates/config_flow_oauth2/integration/__init__.py b/script/scaffold/templates/config_flow_oauth2/integration/__init__.py
index 8eb21d1cece..213740005e5 100644
--- a/script/scaffold/templates/config_flow_oauth2/integration/__init__.py
+++ b/script/scaffold/templates/config_flow_oauth2/integration/__init__.py
@@ -25,10 +25,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
 
     # If using a requests-based API lib
-    hass.data[DOMAIN][entry.entry_id] = api.ConfigEntryAuth(hass, session)
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = api.ConfigEntryAuth(
+        hass, session
+    )
 
     # If using an aiohttp-based API lib
-    hass.data[DOMAIN][entry.entry_id] = api.AsyncConfigEntryAuth(
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = api.AsyncConfigEntryAuth(
         aiohttp_client.async_get_clientsession(hass), session
     )