diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09443e172..f6c297d57 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -76,6 +76,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix playlist preview
 - Use NVIDIA NvEnc API to detect encoder capability instead of heuristic based on GPU model/architecture
 - Use NVIDIA Cuvid API to detect decoder capability instead of heuristic based on GPU model/architecture
+- Fix filler expression not being respected when using a playlist as filler
 
 ### Changed
 - Filler presets: use separate text fields for `hours`, `minutes` and `seconds` duration
diff --git a/ErsatzTV.Core/Scheduling/PlayoutModeSchedulerBase.cs b/ErsatzTV.Core/Scheduling/PlayoutModeSchedulerBase.cs
index 1fb970f8b..e63801559 100644
--- a/ErsatzTV.Core/Scheduling/PlayoutModeSchedulerBase.cs
+++ b/ErsatzTV.Core/Scheduling/PlayoutModeSchedulerBase.cs
@@ -391,7 +391,9 @@ public abstract class PlayoutModeSchedulerBase<T> : IPlayoutModeScheduler<T> whe
                     SmartCollectionId = playlistFiller.SmartCollectionId,
                     SmartCollection = playlistFiller.SmartCollection,
                     PlaylistId = playlistFiller.PlaylistId,
-                    Playlist = playlistFiller.Playlist
+                    Playlist = playlistFiller.Playlist,
+                    Expression = playlistFiller.Expression,
+                    UseChaptersAsMediaItems = playlistFiller.UseChaptersAsMediaItems
                 };
 
                 // if filler count is 2, we need to schedule 2 * (number of items in one full playlist iteration)