diff --git a/src/platform/unix/BuildLinuxImage.sh.in b/src/platform/unix/BuildLinuxImage.sh.in
index a7d6a76c112..77ab1431a71 100644
--- a/src/platform/unix/BuildLinuxImage.sh.in
+++ b/src/platform/unix/BuildLinuxImage.sh.in
@@ -47,17 +47,12 @@ if [ "\$XDG_SESSION_TYPE" = "wayland" ] && [ "\$ZINK_DISABLE_OVERRIDE" != "1" ];
     if command -v glxinfo >/dev/null 2>&1; then
         RENDERER=\$(glxinfo | grep "OpenGL renderer string:" | sed 's/.*: //')
         if echo "\$RENDERER" | grep -qi "NVIDIA"; then
-            if [ "\$ZINK_FORCE_OVERRIDE" = "1" ]; then
-                APPLY_OVERRIDE=1
-            else
-                if command -v nvidia-smi >/dev/null 2>&1; then
-                    DRIVER_VERSION=\$(nvidia-smi --query-gpu=driver_version --format=csv,noheader | head -n1)
-                    DRIVER_MAJOR=\$(echo "\$DRIVER_VERSION" | cut -d. -f1)
-                    [ "\$DRIVER_MAJOR" -gt 555 ] && APPLY_OVERRIDE=1
-                fi
+            if command -v nvidia-smi >/dev/null 2>&1; then
+                DRIVER_VERSION=\$(nvidia-smi --query-gpu=driver_version --format=csv,noheader | head -n1)
+                DRIVER_MAJOR=\$(echo "\$DRIVER_VERSION" | cut -d. -f1)
+                [ "\$DRIVER_MAJOR" -gt 555 ] && ZINK_FORCE_OVERRIDE=1
             fi
-
-            if [ "\$APPLY_OVERRIDE" = "1" ]; then
+            if [ "\$ZINK_FORCE_OVERRIDE" = "1" ]; then
                 export __GLX_VENDOR_LIBRARY_NAME=mesa
                 export __EGL_VENDOR_LIBRARY_FILENAMES=/usr/share/glvnd/egl_vendor.d/50_mesa.json
                 export MESA_LOADER_DRIVER_OVERRIDE=zink