diff --git a/server/src/utils/media.ts b/server/src/utils/media.ts
index b2ffb9ac8b..228b73dd62 100644
--- a/server/src/utils/media.ts
+++ b/server/src/utils/media.ts
@@ -801,9 +801,10 @@ export class VaapiSwDecodeConfig extends BaseHWConfig {
 
   getFilterOptions(videoStream: VideoStreamInfo) {
     const options = this.getToneMapping(videoStream);
-    options.push('hwupload=extra_hw_frames=64');
     if (this.shouldScale(videoStream)) {
-      options.push(`scale_vaapi=${this.getScaling(videoStream)}:mode=hq:out_range=pc:format=nv12`);
+      options.push('hwupload=extra_hw_frames=64', `scale_vaapi=${this.getScaling(videoStream)}:mode=hq:out_range=pc:format=nv12`);
+    } else {
+      options.push('format=nv12', 'hwupload=extra_hw_frames=64');
     }
 
     return options;