diff --git a/homeassistant/components/sql/config_flow.py b/homeassistant/components/sql/config_flow.py
index d52f2d10d0d..de420353d2d 100644
--- a/homeassistant/components/sql/config_flow.py
+++ b/homeassistant/components/sql/config_flow.py
@@ -22,19 +22,32 @@ from .util import resolve_db_url
 
 _LOGGER = logging.getLogger(__name__)
 
-DATA_SCHEMA = vol.Schema(
+OPTIONS_SCHEMA: vol.Schema = vol.Schema(
     {
-        vol.Required(CONF_NAME, default="Select SQL Query"): selector.TextSelector(),
-        vol.Optional(CONF_DB_URL): selector.TextSelector(),
-        vol.Required(CONF_COLUMN_NAME): selector.TextSelector(),
-        vol.Required(CONF_QUERY): selector.TextSelector(
-            selector.TextSelectorConfig(multiline=True)
-        ),
-        vol.Optional(CONF_UNIT_OF_MEASUREMENT): selector.TextSelector(),
-        vol.Optional(CONF_VALUE_TEMPLATE): selector.TemplateSelector(),
+        vol.Optional(
+            CONF_DB_URL,
+        ): selector.TextSelector(),
+        vol.Required(
+            CONF_COLUMN_NAME,
+        ): selector.TextSelector(),
+        vol.Required(
+            CONF_QUERY,
+        ): selector.TextSelector(selector.TextSelectorConfig(multiline=True)),
+        vol.Optional(
+            CONF_UNIT_OF_MEASUREMENT,
+        ): selector.TextSelector(),
+        vol.Optional(
+            CONF_VALUE_TEMPLATE,
+        ): selector.TemplateSelector(),
     }
 )
 
+CONFIG_SCHEMA: vol.Schema = vol.Schema(
+    {
+        vol.Required(CONF_NAME, default="Select SQL Query"): selector.TextSelector(),
+    }
+).extend(OPTIONS_SCHEMA.schema)
+
 
 def validate_sql_select(value: str) -> str | None:
     """Validate that value is a SQL SELECT query."""
@@ -127,7 +140,7 @@ class SQLConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
         return self.async_show_form(
             step_id="user",
-            data_schema=DATA_SCHEMA,
+            data_schema=self.add_suggested_values_to_schema(CONFIG_SCHEMA, user_input),
             errors=errors,
         )
 
@@ -175,43 +188,8 @@ class SQLOptionsFlowHandler(config_entries.OptionsFlow):
 
         return self.async_show_form(
             step_id="init",
-            data_schema=vol.Schema(
-                {
-                    vol.Optional(
-                        CONF_DB_URL,
-                        description={
-                            "suggested_value": self.entry.options.get(CONF_DB_URL)
-                        },
-                    ): selector.TextSelector(),
-                    vol.Required(
-                        CONF_QUERY,
-                        description={"suggested_value": self.entry.options[CONF_QUERY]},
-                    ): selector.TextSelector(
-                        selector.TextSelectorConfig(multiline=True)
-                    ),
-                    vol.Required(
-                        CONF_COLUMN_NAME,
-                        description={
-                            "suggested_value": self.entry.options[CONF_COLUMN_NAME]
-                        },
-                    ): selector.TextSelector(),
-                    vol.Optional(
-                        CONF_UNIT_OF_MEASUREMENT,
-                        description={
-                            "suggested_value": self.entry.options.get(
-                                CONF_UNIT_OF_MEASUREMENT
-                            )
-                        },
-                    ): selector.TextSelector(),
-                    vol.Optional(
-                        CONF_VALUE_TEMPLATE,
-                        description={
-                            "suggested_value": self.entry.options.get(
-                                CONF_VALUE_TEMPLATE
-                            )
-                        },
-                    ): selector.TemplateSelector(),
-                }
+            data_schema=self.add_suggested_values_to_schema(
+                OPTIONS_SCHEMA, user_input or self.entry.options
             ),
             errors=errors,
         )