diff --git a/src/dawn/native/d3d11/BindGroupTrackerD3D11.cpp b/src/dawn/native/d3d11/BindGroupTrackerD3D11.cpp
index 50585d1f31..502fae29f5 100644
--- a/src/dawn/native/d3d11/BindGroupTrackerD3D11.cpp
+++ b/src/dawn/native/d3d11/BindGroupTrackerD3D11.cpp
@@ -171,13 +171,12 @@ MaybeError BindGroupTracker::ApplyBindGroup(BindGroupIndex index) {
                     case kInternalStorageBufferBinding: {
                         ASSERT(IsSubset(bindingInfo.visibility, wgpu::ShaderStage::Compute));
                         ComPtr<ID3D11UnorderedAccessView> d3d11UAV;
-                        DAWN_TRY_ASSIGN(d3d11UAV, ToBackend(binding.buffer)
-                                                      ->CreateD3D11UnorderedAccessView1(
-                                                          0, binding.buffer->GetSize()));
-                        UINT firstElement = offset / 4;
+                        DAWN_TRY_ASSIGN(
+                            d3d11UAV, ToBackend(binding.buffer)
+                                          ->CreateD3D11UnorderedAccessView1(offset, binding.size));
                         if (bindingInfo.visibility & wgpu::ShaderStage::Compute) {
                             deviceContext1->CSSetUnorderedAccessViews(
-                                bindingSlot, 1, d3d11UAV.GetAddressOf(), &firstElement);
+                                bindingSlot, 1, d3d11UAV.GetAddressOf(), nullptr);
                         }
                         break;
                     }
diff --git a/src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp b/src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp
index 6e1b17c9d8..549a5bb34d 100644
--- a/src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp
+++ b/src/dawn/tests/end2end/DrawIndexedIndirectTests.cpp
@@ -303,9 +303,6 @@ TEST_P(DrawIndexedIndirectTest, ValidateMultipleDraws) {
     // TODO(dawn:1549) Fails on Qualcomm-based Android devices.
     DAWN_SUPPRESS_TEST_IF(IsAndroid() && IsQualcomm());
 
-    // TODO(dawn:1791): Test fails with D3D11.
-    DAWN_SUPPRESS_TEST_IF(IsD3D11());
-
     // It doesn't make sense to test invalid inputs when validation is disabled.
     DAWN_SUPPRESS_TEST_IF(HasToggleEnabled("skip_validation"));