diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e75e5f26..f1ecd581c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -42,6 +42,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix QSV capability detection on Linux using non-drm displays (e.g. wayland)
 - Fix playlist filtering bug that made HLS Segmenter more likely to fail when streaming for multiple hours
 - Fix NVIDIA overlaying text subtitles and permanent watermark on 10-bit content
+- Fix UI error adding deco
+- Fix UI error editing watermarks and graphics elements on blocks
 
 ### Changed
 - Do not use graphics engine for single, permanent watermark
diff --git a/ErsatzTV.Application/Scheduling/Commands/CreateDecoHandler.cs b/ErsatzTV.Application/Scheduling/Commands/CreateDecoHandler.cs
index 61c45e2a4..78d05fa8c 100644
--- a/ErsatzTV.Application/Scheduling/Commands/CreateDecoHandler.cs
+++ b/ErsatzTV.Application/Scheduling/Commands/CreateDecoHandler.cs
@@ -30,6 +30,7 @@ public class CreateDecoHandler(IDbContextFactory<TvContext> dbContextFactory)
         {
             DecoGroupId = request.DecoGroupId,
             Name = name,
+            BreakContent = [],
             DecoWatermarks = [],
             DecoGraphicsElements = []
         });
diff --git a/ErsatzTV.Application/Scheduling/Commands/ReplaceBlockItems.cs b/ErsatzTV.Application/Scheduling/Commands/ReplaceBlockItems.cs
index acabf4eff..1aebb0633 100644
--- a/ErsatzTV.Application/Scheduling/Commands/ReplaceBlockItems.cs
+++ b/ErsatzTV.Application/Scheduling/Commands/ReplaceBlockItems.cs
@@ -10,4 +10,4 @@ public record ReplaceBlockItems(
     int Minutes,
     BlockStopScheduling StopScheduling,
     List<ReplaceBlockItem> Items)
-    : IRequest<Either<BaseError, List<BlockItemViewModel>>>;
+    : IRequest<Either<BaseError, Unit>>;
diff --git a/ErsatzTV.Application/Scheduling/Commands/ReplaceBlockItemsHandler.cs b/ErsatzTV.Application/Scheduling/Commands/ReplaceBlockItemsHandler.cs
index ac840faf2..5c8e218dd 100644
--- a/ErsatzTV.Application/Scheduling/Commands/ReplaceBlockItemsHandler.cs
+++ b/ErsatzTV.Application/Scheduling/Commands/ReplaceBlockItemsHandler.cs
@@ -8,9 +8,9 @@ using Microsoft.EntityFrameworkCore;
 namespace ErsatzTV.Application.Scheduling;
 
 public class ReplaceBlockItemsHandler(IDbContextFactory<TvContext> dbContextFactory)
-    : IRequestHandler<ReplaceBlockItems, Either<BaseError, List<BlockItemViewModel>>>
+    : IRequestHandler<ReplaceBlockItems, Either<BaseError, Unit>>
 {
-    public async Task<Either<BaseError, List<BlockItemViewModel>>> Handle(
+    public async Task<Either<BaseError, Unit>> Handle(
         ReplaceBlockItems request,
         CancellationToken cancellationToken)
     {
@@ -19,7 +19,7 @@ public class ReplaceBlockItemsHandler(IDbContextFactory<TvContext> dbContextFact
         return await validation.Apply(ps => Persist(dbContext, request, ps, cancellationToken));
     }
 
-    private static async Task<List<BlockItemViewModel>> Persist(
+    private static async Task<Unit> Persist(
         TvContext dbContext,
         ReplaceBlockItems request,
         Block block,
@@ -41,7 +41,7 @@ public class ReplaceBlockItemsHandler(IDbContextFactory<TvContext> dbContextFact
         //     await _channel.WriteAsync(new BuildPlayout(playout.Id, PlayoutBuildMode.Refresh));
         // }
 
-        return block.Items.Map(Mapper.ProjectToViewModel).ToList();
+        return Unit.Default;
     }
 
     private static BlockItem BuildItem(Block block, int index, ReplaceBlockItem item)