diff --git a/src/gpu/gpu_dx12/gpu_dx12.c b/src/gpu/gpu_dx12/gpu_dx12.c
index 6df21710..23918206 100644
--- a/src/gpu/gpu_dx12/gpu_dx12.c
+++ b/src/gpu/gpu_dx12/gpu_dx12.c
@@ -771,12 +771,12 @@ GPU_D12_Descriptor *GPU_D12_PushDescriptor(GPU_D12_Arena *gpu_arena, GPU_D12_Des
             }
             else
             {
-                descriptor = PushStructNoZero(heap->descriptors_arena, GPU_D12_Descriptor);
                 index = ArenaCount(heap->descriptors_arena, GPU_D12_Descriptor);
                 if (index >= heap->max_count)
                 {
                     Panic(Lit("Max descriptors reached in heap"));
                 }
+                descriptor = PushStructNoZero(heap->descriptors_arena, GPU_D12_Descriptor);
             }
         }
         Unlock(&lock);