diff --git a/src/dxvk/dxvk_context.cpp b/src/dxvk/dxvk_context.cpp
index 64a15484..72ef7f3b 100644
--- a/src/dxvk/dxvk_context.cpp
+++ b/src/dxvk/dxvk_context.cpp
@@ -230,6 +230,9 @@ namespace dxvk {
           uint32_t              value) {
     this->spillRenderPass();
     
+    if (length == buffer->info().size)
+      length = align(length, 4);
+    
     auto slice = buffer->subSlice(offset, length);
     
     m_cmd->cmdFillBuffer(