diff --git a/script/scaffold/__main__.py b/script/scaffold/__main__.py
index 05ef300d33e..2d4454c254b 100644
--- a/script/scaffold/__main__.py
+++ b/script/scaffold/__main__.py
@@ -61,7 +61,7 @@ def main():
         if not args.template.startswith("config_flow"):
             if info.helper:
                 template = "config_flow_helper"
-            if info.oauth2:
+            elif info.oauth2:
                 template = "config_flow_oauth2"
             elif info.authentication or not info.discoverable:
                 template = "config_flow"
diff --git a/script/scaffold/model.py b/script/scaffold/model.py
index a73165de770..2b1ee71fc63 100644
--- a/script/scaffold/model.py
+++ b/script/scaffold/model.py
@@ -22,6 +22,7 @@ class Info:
     authentication: str = attr.ib(default=None)
     discoverable: str = attr.ib(default=None)
     oauth2: str = attr.ib(default=None)
+    helper: str = attr.ib(default=None)
 
     files_added: set[Path] = attr.ib(factory=set)
     tests_added: set[Path] = attr.ib(factory=set)