diff --git a/CHANGELOG.md b/CHANGELOG.md
index a44abc538..ad6219d43 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 ## [Unreleased]
+### Changed
+- Always use software pipeline for error display
+  - This ensures errors will display even when hardware acceleration is misconfigured
 
 ## [0.7.2-beta] - 2023-01-05
 ### Fixed
diff --git a/ErsatzTV.Core/FFmpeg/FFmpegPlaybackSettingsCalculator.cs b/ErsatzTV.Core/FFmpeg/FFmpegPlaybackSettingsCalculator.cs
index 79f8858a0..6ff541b79 100644
--- a/ErsatzTV.Core/FFmpeg/FFmpegPlaybackSettingsCalculator.cs
+++ b/ErsatzTV.Core/FFmpeg/FFmpegPlaybackSettingsCalculator.cs
@@ -39,12 +39,6 @@ public class FFmpegPlaybackSettingsCalculator
         "+igndts"
     };
 
-    public FFmpegPlaybackSettings ConcatSettings => new()
-    {
-        ThreadCount = 1,
-        FormatFlags = CommonFormatFlags
-    };
-
     public FFmpegPlaybackSettings CalculateSettings(
         StreamingMode streamingMode,
         FFmpegProfile ffmpegProfile,
@@ -181,7 +175,8 @@ public class FFmpegPlaybackSettingsCalculator
         bool hlsRealtime) =>
         new()
         {
-            HardwareAcceleration = ffmpegProfile.HardwareAcceleration,
+            // HardwareAcceleration = ffmpegProfile.HardwareAcceleration,
+            HardwareAcceleration = HardwareAccelerationKind.None,
             FormatFlags = CommonFormatFlags,
             VideoFormat = ffmpegProfile.VideoFormat,
             VideoBitrate = ffmpegProfile.VideoBitrate,