diff --git a/.pick_status.json b/.pick_status.json
index b765f296d91..8e6193afee0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -19464,7 +19464,7 @@
         "description": "n50/compute: submit initial compute state in nv50_screen_create",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "ff72440b40211326eda118232fabd53965410afd",
         "notes": null
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_screen.c b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
index 5cdac587320..5b38bdab9a9 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_screen.c
+++ b/src/gallium/drivers/nouveau/nv50/nv50_screen.c
@@ -787,8 +787,6 @@ nv50_screen_init_hwctx(struct nv50_screen *screen)
    PUSH_DATA (push, 1);
    BEGIN_NV04(push, NV50_3D(UNK19C0), 1);
    PUSH_DATA (push, 1);
-
-   PUSH_KICK (push);
 }
 
 static int nv50_tls_alloc(struct nv50_screen *screen, unsigned tls_space,
@@ -1071,6 +1069,9 @@ nv50_screen_create(struct nouveau_device *dev)
       goto fail;
    }
 
+   // submit all initial state
+   PUSH_KICK(screen->base.pushbuf);
+
    return &screen->base;
 
 fail: