diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index bad0ac6b1..d5e37fbcd 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -235,8 +235,8 @@ namespace dxvk {
     m_state.vi.vertexBuffers[binding] = buffer;
     m_flags.set(DxvkContextFlag::GpDirtyVertexBuffers);
     
-    if (unlikely(!m_features.test(DxvkContextFeature::NullDescriptors))
-     && unlikely(!buffer.defined()))
+    if (unlikely(!buffer.defined())
+     && unlikely(!m_features.test(DxvkContextFeature::NullDescriptors)))
       stride = 0;
     
     if (unlikely(m_state.vi.vertexStrides[binding] != stride)) {