diff --git a/.pick_status.json b/.pick_status.json
index de4c8deaf38..03036e563ba 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -580,7 +580,7 @@
         "description": "panfrost: fix off-by-one when exporting format modifiers",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "2a1217513e1c5d881718c2a7f2afb951e1fe6305"
     },
diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index 36f15c2a5d8..a14b34c677d 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -620,14 +620,13 @@ panfrost_walk_dmabuf_modifiers(struct pipe_screen *screen,
                     test_modifier != pan_best_modifiers[i])
                         continue;
 
-                count++;
-
                 if (max > (int) count) {
                         modifiers[count] = pan_best_modifiers[i];
 
                         if (external_only)
                                 external_only[count] = false;
                 }
+                count++;
         }
 
         *out_count = count;