diff --git a/CHANGELOG.md b/CHANGELOG.md
index 712dc99dc..3c7ba73fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 ### Fixed
 - Fix app startup with MySql/MariaDB
+- YAML playout: fix `pad_to_next` always running over time
 
 ### Changed
 - Always tell ffmpeg to stop encoding with a specific duration
diff --git a/ErsatzTV.Core/Scheduling/YamlScheduling/Handlers/YamlPlayoutPadToNextHandler.cs b/ErsatzTV.Core/Scheduling/YamlScheduling/Handlers/YamlPlayoutPadToNextHandler.cs
index b111d757d..c9e9bd637 100644
--- a/ErsatzTV.Core/Scheduling/YamlScheduling/Handlers/YamlPlayoutPadToNextHandler.cs
+++ b/ErsatzTV.Core/Scheduling/YamlScheduling/Handlers/YamlPlayoutPadToNextHandler.cs
@@ -59,7 +59,7 @@ public class YamlPlayoutPadToNextHandler(EnumeratorCache enumeratorCache) : Yaml
                 padToNext.Content,
                 padToNext.Fallback,
                 targetTime,
-                false,
+                stopBeforeEnd: true,
                 padToNext.DiscardAttempts,
                 padToNext.Trim,
                 true,