diff --git a/.pick_status.json b/.pick_status.json
index f1b623cada4..b09828901d3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2965,7 +2965,7 @@
         "description": "radv: Fix threading issue with submission refcounts.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "4aa75bb3bdd195d4715ee8fae51bfb0c0fcd823b"
     },
diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 745ef636ae1..bb97cd86543 100644
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -4312,6 +4312,12 @@ radv_queue_enqueue_submission(struct radv_deferred_queue_submission *submission,
 	 * submitted, but if the queue was empty, we decrement ourselves as there is no previous
 	 * submission. */
 	uint32_t decrement = submission->wait_semaphore_count - wait_cnt + (is_first ? 1 : 0);
+
+	/* if decrement is zero, then we don't have a refcounted reference to the
+	 * submission anymore, so it is not safe to access the submission. */
+	if (!decrement)
+		return VK_SUCCESS;
+
 	return radv_queue_trigger_submission(submission, decrement, processing_list);
 }