diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c
index 36ee00dcda6..ce55bce9b1f 100644
--- a/src/gallium/drivers/panfrost/pan_cmdstream.c
+++ b/src/gallium/drivers/panfrost/pan_cmdstream.c
@@ -936,7 +936,8 @@ panfrost_emit_const_buf(struct panfrost_batch *batch,
                 }
         }
 
-        *push_constants = transfer.gpu;
+        if (ss->uniform_count)
+                *push_constants = transfer.gpu;
 
         buf->dirty_mask = 0;
         return ubos.gpu;