diff --git a/src/etnaviv/drm/etnaviv_cmd_stream.c b/src/etnaviv/drm/etnaviv_cmd_stream.c
index 41d1fe01c95..93a7a87930d 100644
--- a/src/etnaviv/drm/etnaviv_cmd_stream.c
+++ b/src/etnaviv/drm/etnaviv_cmd_stream.c
@@ -230,7 +230,8 @@ void etna_cmd_stream_flush(struct etna_cmd_stream *stream, int in_fence_fd,
 	if (gpu->dev->use_softpin)
 		req.flags |= ETNA_SUBMIT_SOFTPIN;
 
-	if (stream->offset == priv->offset_end_of_context_init && !out_fence_fd)
+	if (stream->offset == priv->offset_end_of_context_init && !out_fence_fd &&
+	    !priv->submit.nr_pmrs)
 		is_noop = true;
 
 	if (likely(!is_noop)) {