diff --git a/src/gallium/drivers/freedreno/freedreno_blitter.c b/src/gallium/drivers/freedreno/freedreno_blitter.c
index d45ae670c01..59e35468336 100644
--- a/src/gallium/drivers/freedreno/freedreno_blitter.c
+++ b/src/gallium/drivers/freedreno/freedreno_blitter.c
@@ -225,6 +225,13 @@ fd_blitter_clear(struct pipe_context *pctx, unsigned buffers,
 	pctx->bind_vs_state(pctx, ctx->solid_prog.vs);
 	pctx->bind_fs_state(pctx, ctx->solid_prog.fs);
 
+	/* Clear geom/tess shaders, lest the draw emit code think we are
+	 * trying to use use them:
+	 */
+	pctx->bind_gs_state(pctx, NULL);
+	pctx->bind_tcs_state(pctx, NULL);
+	pctx->bind_tes_state(pctx, NULL);
+
 	struct pipe_draw_info info = {
 		.mode = PIPE_PRIM_MAX,    /* maps to DI_PT_RECTLIST */
 		.count = 2,