diff --git a/src/d3d11/d3d11_buffer.cpp b/src/d3d11/d3d11_buffer.cpp
index bfb8f016..40499b9a 100644
--- a/src/d3d11/d3d11_buffer.cpp
+++ b/src/d3d11/d3d11_buffer.cpp
@@ -200,6 +200,10 @@ namespace dxvk {
 
   HRESULT D3D11Buffer::ValidateBufferProperties(
     const D3D11_BUFFER_DESC*      pDesc) {
+    // Zero-sized buffers are illegal
+    if (!pDesc->ByteWidth)
+      return E_INVALIDARG;
+
     // Basic validation for structured buffers
     if ((pDesc->MiscFlags & D3D11_RESOURCE_MISC_BUFFER_STRUCTURED)
      && ((pDesc->StructureByteStride == 0)