diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index 820350c0..6462e4d2 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -241,10 +241,6 @@ namespace dxvk {
     m_state.vi.vertexBuffers[binding] = buffer;
     m_flags.set(DxvkContextFlag::GpDirtyVertexBuffers);
     
-    if (unlikely(!buffer.defined())
-     && unlikely(!m_features.test(DxvkContextFeature::NullDescriptors)))
-      stride = 0;
-    
     if (unlikely(m_state.vi.vertexStrides[binding] != stride)) {
       m_state.vi.vertexStrides[binding] = stride;
       m_flags.set(DxvkContextFlag::GpDirtyPipelineState);
diff --git a/src/dxvk/dxvk_context.h b/src/dxvk/dxvk_context.h
index 1d029689..39c5b989 100644
--- a/src/dxvk/dxvk_context.h
+++ b/src/dxvk/dxvk_context.h
@@ -156,6 +156,7 @@ namespace dxvk {
     /**
      * \brief Binds vertex buffer
      * 
+     * When binding a null buffer, stride must be 0.
      * \param [in] binding Vertex buffer binding
      * \param [in] buffer New vertex buffer
      * \param [in] stride Stride between vertices
@@ -164,7 +165,7 @@ namespace dxvk {
             uint32_t              binding,
       const DxvkBufferSlice&      buffer,
             uint32_t              stride);
-    
+
     /**
      * \brief Binds transform feedback buffer
      *