diff --git a/CHANGELOG.md b/CHANGELOG.md
index b3cddaf0d..d73b8c608 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix block history being removed when it is still needed for mirror channel
   - This caused playout build errors like "Unable to locate history for playout item"
 - Fix crashes due to invalid smart collection searches, e.g. `smart_collection:"this collection does not exist"`
+- Fix UI crash when editing block playout that has default deco
 
 ## [25.8.0] - 2025-10-26
 ### Added
diff --git a/ErsatzTV.Application/Scheduling/Queries/GetDecoByPlayoutIdHandler.cs b/ErsatzTV.Application/Scheduling/Queries/GetDecoByPlayoutIdHandler.cs
index 3306351f9..30e8fe99e 100644
--- a/ErsatzTV.Application/Scheduling/Queries/GetDecoByPlayoutIdHandler.cs
+++ b/ErsatzTV.Application/Scheduling/Queries/GetDecoByPlayoutIdHandler.cs
@@ -20,6 +20,8 @@ public class GetDecoByPlayoutIdHandler(IDbContextFactory<TvContext> dbContextFac
             .Include(p => p.Deco)
             .ThenInclude(d => d.DecoGraphicsElements)
             .ThenInclude(d => d.GraphicsElement)
+            .Include(p => p.Deco)
+            .ThenInclude(d => d.BreakContent)
             .SelectOneAsync(p => p.Id, p => p.Id == request.PlayoutId && p.DecoId != null, cancellationToken)
             .MapT(p => Mapper.ProjectToViewModel(p.Deco));
     }