diff --git a/src/util/00-mesa-defaults.conf b/src/util/00-mesa-defaults.conf
index 6bcb720848a..47e82efc8ba 100644
--- a/src/util/00-mesa-defaults.conf
+++ b/src/util/00-mesa-defaults.conf
@@ -381,6 +381,7 @@ TODO: document the other workarounds.
           -->
         <application name="SPECviewperf13" executable="viewperf">
             <option name="vblank_mode" value="0" />
+            <option name="glthread_nop_check_framebuffer_status" value="true" />
             <option name="allow_glsl_extension_directive_midshader" value="true" />
             <option name="allow_glsl_120_subset_in_110" value="true" />
             <!-- This makes it use GL_NVX_gpu_memory_info to query memory info
@@ -1068,7 +1069,6 @@ TODO: document the other workarounds.
             <option name="radeonsi_zerovram" value="true" />
         </application>
         <application name="SPECviewperf13" executable="viewperf">
-            <option name="glthread_nop_check_framebuffer_status" value="true" />
             <option name="radeonsi_sync_compile" value="true" />
         </application>
         <application name="Road Redemption" executable="RoadRedemption.x86_64">