diff --git a/.pick_status.json b/.pick_status.json
index e2e9dac4af1..1f934f79fad 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1794,7 +1794,7 @@
         "description": "anv: Use correct engine class for companion RCS",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "6f138fe723506a41519ec3956a89488893114705",
         "notes": null
diff --git a/src/intel/vulkan/anv_batch_chain.c b/src/intel/vulkan/anv_batch_chain.c
index 0b572fc653a..3d613e4cea2 100644
--- a/src/intel/vulkan/anv_batch_chain.c
+++ b/src/intel/vulkan/anv_batch_chain.c
@@ -1712,7 +1712,9 @@ anv_async_submit_init(struct anv_async_submit *submit,
       .relocs = &submit->relocs,
       .user_data = submit,
       .extend_cb = anv_async_submit_extend_batch,
-      .engine_class = queue->family->engine_class,
+      .engine_class = use_companion_rcs ?
+                      INTEL_ENGINE_CLASS_RENDER :
+                      queue->family->engine_class,
    };
 
    util_dynarray_init(&submit->batch_bos, NULL);