diff --git a/.pick_status.json b/.pick_status.json
index ad85ee20307..b97ffb384d4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -292,7 +292,7 @@
         "description": "nir/lower_mediump_io: Don't remap base unless needed",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "fb29cef8ddabdd05aeddc5220017bb28a83bb19c"
     },
diff --git a/src/compiler/nir/nir_lower_mediump.c b/src/compiler/nir/nir_lower_mediump.c
index 0cc58c1e755..f4b10806358 100644
--- a/src/compiler/nir/nir_lower_mediump.c
+++ b/src/compiler/nir/nir_lower_mediump.c
@@ -224,7 +224,7 @@ nir_lower_mediump_io(nir_shader *nir, nir_variable_mode modes,
       }
    }
 
-   if (changed)
+   if (changed && use_16bit_slots)
       nir_recompute_io_bases(impl, modes);
 
    nir_metadata_preserve(impl, nir_metadata_all);