diff --git a/.pick_status.json b/.pick_status.json
index 2703fa03eef..4d0093b376a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2659,7 +2659,7 @@
         "description": "iris: correctly set alignment to next power of two for struct size",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "c24a574e6c78db038d7aa6c4605bf6a8a892f7ab"
     },
diff --git a/src/gallium/drivers/iris/iris_query.c b/src/gallium/drivers/iris/iris_query.c
index a5c4c94ad0b..2d2c5bc86f1 100644
--- a/src/gallium/drivers/iris/iris_query.c
+++ b/src/gallium/drivers/iris/iris_query.c
@@ -521,7 +521,8 @@ iris_begin_query(struct pipe_context *ctx, struct pipe_query *query)
       size = sizeof(struct iris_query_snapshots);
 
    u_upload_alloc(ice->query_buffer_uploader, 0,
-                  size, size, &q->query_state_ref.offset,
+                  size, util_next_power_of_two(size),
+                  &q->query_state_ref.offset,
                   &q->query_state_ref.res, &ptr);
 
    if (!iris_resource_bo(q->query_state_ref.res))