diff --git a/.pick_status.json b/.pick_status.json
index 83dbcb1ce39..e2d014a8df8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1334,7 +1334,7 @@
         "description": "brw: avoid invalid URB messages",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null,
         "notes": null
diff --git a/src/intel/compiler/brw/brw_compile_gs.cpp b/src/intel/compiler/brw/brw_compile_gs.cpp
index 366f522fc01..a24a9767a49 100644
--- a/src/intel/compiler/brw/brw_compile_gs.cpp
+++ b/src/intel/compiler/brw/brw_compile_gs.cpp
@@ -52,8 +52,10 @@ brw_emit_gs_thread_end(brw_shader &s)
 
       brw_reg srcs[URB_LOGICAL_NUM_SRCS];
       srcs[URB_LOGICAL_SRC_HANDLE] = s.gs_payload().urb_handles;
+      srcs[URB_LOGICAL_SRC_DATA] = brw_imm_ud(0);
+      srcs[URB_LOGICAL_SRC_CHANNEL_MASK] = brw_imm_ud(0);
       urb = abld.URB_WRITE(srcs, ARRAY_SIZE(srcs));
-      urb->components = 0;
+      urb->components = 1;
    } else {
       brw_reg srcs[URB_LOGICAL_NUM_SRCS];
       srcs[URB_LOGICAL_SRC_HANDLE] = s.gs_payload().urb_handles;