diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b78c06d9..795d8d040 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix schedule start time calculation when daily playout build goes beyond midnight and into a different alternate schedule
 - Fix compatibility with older NVIDIA devices (compute capability 3.0+) in unified docker image
 - Fix transitions when using NVIDIA acceleration
+- Fix transitions when using QSV acceleration (on Windows and on Linux)
 
 ### Changed
 - Always tell ffmpeg to stop encoding with a specific duration
diff --git a/ErsatzTV.FFmpeg/Pipeline/PipelineBuilderBase.cs b/ErsatzTV.FFmpeg/Pipeline/PipelineBuilderBase.cs
index 88d10004b..e3b47b19a 100644
--- a/ErsatzTV.FFmpeg/Pipeline/PipelineBuilderBase.cs
+++ b/ErsatzTV.FFmpeg/Pipeline/PipelineBuilderBase.cs
@@ -351,8 +351,7 @@ public abstract class PipelineBuilderBase : IPipelineBuilder
                 {
                     foreach (string segmentTemplate in ffmpegState.HlsSegmentTemplate)
                     {
-                        //bool oneSecondGop = ffmpegState.EncoderHardwareAccelerationMode is HardwareAccelerationMode.Qsv;
-                        var oneSecondGop = false;
+                        bool oneSecondGop = ffmpegState.EncoderHardwareAccelerationMode is HardwareAccelerationMode.Qsv;
 
                         pipelineSteps.Add(
                             new OutputFormatHls(