diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c
index 90e05a590f3..d900467964b 100644
--- a/src/gallium/drivers/radeonsi/si_pipe.c
+++ b/src/gallium/drivers/radeonsi/si_pipe.c
@@ -622,7 +622,8 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen,
 		sctx->b.create_video_buffer = vl_video_buffer_create;
 	}
 
-	if (sctx->chip_class >= GFX9) {
+	if (sctx->chip_class >= GFX9 ||
+	    si_compute_prim_discard_enabled(sctx)) {
 		sctx->wait_mem_scratch = si_resource(
 			pipe_buffer_create(screen, 0, PIPE_USAGE_DEFAULT, 8));
 		if (!sctx->wait_mem_scratch)