diff --git a/esphome/components/script/__init__.py b/esphome/components/script/__init__.py
index 6c16d002ad..2c79e9ed0a 100644
--- a/esphome/components/script/__init__.py
+++ b/esphome/components/script/__init__.py
@@ -9,7 +9,6 @@ CODEOWNERS = ["@esphome/core"]
 script_ns = cg.esphome_ns.namespace("script")
 Script = script_ns.class_("Script", automation.Trigger.template())
 ScriptExecuteAction = script_ns.class_("ScriptExecuteAction", automation.Action)
-ScriptStopAction = script_ns.class_("ScriptStopAction", automation.Action)
 ScriptWaitAction = script_ns.class_("ScriptWaitAction", automation.Action, cg.Component)
 SingleScript = script_ns.class_("SingleScript", Script)
 RestartScript = script_ns.class_("RestartScript", Script)
@@ -206,16 +205,11 @@ async def script_execute_action_to_code(config, action_id, template_arg, args):
     return var
 
 
-@automation.register_action(
+automation.register_apply_action(
     "script.stop",
-    ScriptStopAction,
     maybe_simple_id({cv.Required(CONF_ID): cv.use_id(Script)}),
-    synchronous=True,
+    automation.ApplyCall("stop()"),
 )
-async def script_stop_action_to_code(config, action_id, template_arg, args):
-    full_id, paren = await cg.get_variable_with_full_id(config[CONF_ID])
-    template_arg = cg.TemplateArguments(full_id.type, *template_arg)
-    return cg.new_Pvariable(action_id, template_arg, paren)
 
 
 @automation.register_action(
diff --git a/esphome/components/script/script.h b/esphome/components/script/script.h
index d83555016d..b9ea75e0bc 100644
--- a/esphome/components/script/script.h
+++ b/esphome/components/script/script.h
@@ -257,16 +257,6 @@ template<class... As, typename... Ts> class ScriptExecuteAction<Script<As...>, T
   Args args_;
 };
 
-template<class C, typename... Ts> class ScriptStopAction final : public Action<Ts...> {
- public:
-  ScriptStopAction(C *script) : script_(script) {}
-
-  void play(const Ts &...x) override { this->script_->stop(); }
-
- protected:
-  C *script_;
-};
-
 /** Wait for a script to finish before continuing.
  *
  * Uses queue-based storage to safely handle concurrent executions.
diff --git a/tests/components/script/common.yaml b/tests/components/script/common.yaml
index f4818e2296..6b7290277a 100644
--- a/tests/components/script/common.yaml
+++ b/tests/components/script/common.yaml
@@ -15,6 +15,8 @@ esphome:
           strings: ["a", "b"]
       - script.wait: my_script
       - script.stop: my_script
+      - script.stop:
+          id: my_script_queued
       - if:
           condition:
             - script.is_running: my_script