diff --git a/.pick_status.json b/.pick_status.json
index de4b3c2d87a..2b86367b3b3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -121,7 +121,7 @@
         "description": "radv: fix optional pSizes parameter when binding streamout buffers",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "b4eb029062a944c428d6214447a852318e36016e"
     },
diff --git a/src/amd/vulkan/radv_cmd_buffer.c b/src/amd/vulkan/radv_cmd_buffer.c
index 549b7e8843d..c0d5c44dadf 100644
--- a/src/amd/vulkan/radv_cmd_buffer.c
+++ b/src/amd/vulkan/radv_cmd_buffer.c
@@ -5905,7 +5905,12 @@ void radv_CmdBindTransformFeedbackBuffersEXT(
 
 		sb[idx].buffer = radv_buffer_from_handle(pBuffers[i]);
 		sb[idx].offset = pOffsets[i];
-		sb[idx].size = pSizes[i];
+
+		if (!pSizes || pSizes[i] == VK_WHOLE_SIZE) {
+			sb[idx].size = sb[idx].buffer->size - sb[idx].offset;
+		} else {
+			sb[idx].size = pSizes[i];
+		}
 
 		radv_cs_add_buffer(cmd_buffer->device->ws, cmd_buffer->cs,
 				   sb[idx].buffer->bo);