diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64c47fcf2..2f49edcff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix MPEG2 video format with QSV and VAAPI acceleration
 - Fix playback of content with undefined colorspace
 - Fix NVIDIA color normalization with VP9 sources
+- Fix fallback filler looping
 
 ### Changed
 - Merge generated `Other Video` folder tags with tags from sidecar NFO
diff --git a/ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs b/ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs
index 5b28cdfeb..614da99f5 100644
--- a/ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs
+++ b/ErsatzTV.Core/FFmpeg/FFmpegLibraryProcessService.cs
@@ -216,7 +216,7 @@ public class FFmpegLibraryProcessService : IFFmpegProcessService
 
         var desiredState = new FrameState(
             playbackSettings.RealtimeOutput,
-            false, // TODO: fallback filler needs to loop
+            fillerKind == FillerKind.Fallback,
             videoFormat,
             Optional(videoStream.Profile),
             Optional(desiredPixelFormat),