diff --git a/.pick_status.json b/.pick_status.json
index 6a39abfd2b8..56578c6a610 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2596,7 +2596,7 @@
         "description": "panfrost: Raise TEXTURE_BUFFER_OFFSET_ALIGNMENT",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "5f7bafa316f60ff79b9839cf88142b33f330a8e7"
     },
diff --git a/src/gallium/drivers/panfrost/pan_screen.c b/src/gallium/drivers/panfrost/pan_screen.c
index e94534abb64..6822678ca1c 100644
--- a/src/gallium/drivers/panfrost/pan_screen.c
+++ b/src/gallium/drivers/panfrost/pan_screen.c
@@ -192,8 +192,9 @@ panfrost_get_param(struct pipe_screen *screen, enum pipe_cap param)
         case PIPE_CAP_MAX_TEXTURE_BUFFER_SIZE:
                 return 65536;
 
+        /* Must be at least 64 for correct behaviour */
         case PIPE_CAP_TEXTURE_BUFFER_OFFSET_ALIGNMENT:
-                return 16;
+                return 64;
 
         case PIPE_CAP_QUERY_TIMESTAMP:
                 return is_gl3;