diff --git a/src/mesa/state_tracker/st_atom_array.c b/src/mesa/state_tracker/st_atom_array.c
index 19a5ef29a98..9831045b340 100644
--- a/src/mesa/state_tracker/st_atom_array.c
+++ b/src/mesa/state_tracker/st_atom_array.c
@@ -498,10 +498,10 @@ st_update_array(struct st_context *st)
                     0, cursor - data, max_alignment, data,
                     &vbuffer[bufidx].buffer_offset,
                     &vbuffer[bufidx].buffer.resource);
-   }
 
-   if (!ctx->Const.AllowMappedBuffersDuringExecution) {
-      u_upload_unmap(st->pipe->stream_uploader);
+      if (!ctx->Const.AllowMappedBuffersDuringExecution) {
+         u_upload_unmap(st->pipe->stream_uploader);
+      }
    }
 
    const unsigned num_inputs = st->vp_variant->num_inputs;