diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0943d5072..bc70a7c1b 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 updating (re-adding) Trakt lists to properly use new metadata ids that were not present when originally added
 - Fix local show library scanning with non-english season folder names, e.g. `Staffel 02`
 - Fix bug where local libraries would merge with media server libraries when the same file was added to both libraries
+- Fix transcoding some 10-bit content from media servers using VAAPI acceleration
 
 ### Changed
 - Use Poster artwork for XMLTV if available
diff --git a/ErsatzTV.FFmpeg/Filter/ColorspaceFilter.cs b/ErsatzTV.FFmpeg/Filter/ColorspaceFilter.cs
index cce4d8caf..25409aaa5 100644
--- a/ErsatzTV.FFmpeg/Filter/ColorspaceFilter.cs
+++ b/ErsatzTV.FFmpeg/Filter/ColorspaceFilter.cs
@@ -47,9 +47,20 @@ public class ColorspaceFilter : BaseFilter
                 hwdownload = "hwdownload,";
                 foreach (IPixelFormat pixelFormat in _currentState.PixelFormat)
                 {
-                    if (!string.IsNullOrWhiteSpace(pixelFormat.FFmpegName))
+                    string name = pixelFormat.FFmpegName;
+                    
+                    // vaapi is not a target software format
+                    if (pixelFormat is PixelFormatVaapi vaapi)
                     {
-                        hwdownload = $"hwdownload,format={pixelFormat.FFmpegName},";
+                        foreach (IPixelFormat pf in AvailablePixelFormats.ForPixelFormat(vaapi.Name, null))
+                        {
+                            name = pf.FFmpegName;
+                        }
+                    }
+                    
+                    if (!string.IsNullOrWhiteSpace(name))
+                    {
+                        hwdownload = $"hwdownload,format={name},";
                     }
                 }
             }