diff --git a/src/d3d9/d3d9_device.cpp b/src/d3d9/d3d9_device.cpp
index ecce32f01..5a69632bc 100644
--- a/src/d3d9/d3d9_device.cpp
+++ b/src/d3d9/d3d9_device.cpp
@@ -2815,11 +2815,13 @@ namespace dxvk {
     if (needsUpdate)
       vbo.vertexBuffer = buffer;
 
-    needsUpdate |= vbo.offset != OffsetInBytes
-                || vbo.stride != Stride;
+    if (buffer != nullptr) {
+      needsUpdate |= vbo.offset != OffsetInBytes
+                  || vbo.stride != Stride;
 
-    vbo.offset = OffsetInBytes;
-    vbo.stride = Stride;
+      vbo.offset = OffsetInBytes;
+      vbo.stride = Stride;
+    }
 
     if (needsUpdate)
       BindVertexBuffer(StreamNumber, buffer, OffsetInBytes, Stride);