diff --git a/gpu/src/Device.zig b/gpu/src/Device.zig
index 70471616..e36f99bb 100644
--- a/gpu/src/Device.zig
+++ b/gpu/src/Device.zig
@@ -27,7 +27,7 @@ pub const VTable = struct {
     // WGPU_EXPORT WGPUBindGroup wgpuDeviceCreateBindGroup(WGPUDevice device, WGPUBindGroupDescriptor const * descriptor);
     // WGPU_EXPORT WGPUBindGroupLayout wgpuDeviceCreateBindGroupLayout(WGPUDevice device, WGPUBindGroupLayoutDescriptor const * descriptor);
     // WGPU_EXPORT WGPUBuffer wgpuDeviceCreateBuffer(WGPUDevice device, WGPUBufferDescriptor const * descriptor);
-    createCommandEncoder: fn (ptr: *anyopaque, descriptor: *const CommandEncoder.Descriptor) CommandEncoder,
+    createCommandEncoder: fn (ptr: *anyopaque, descriptor: ?*const CommandEncoder.Descriptor) CommandEncoder,
     // WGPU_EXPORT WGPUComputePipeline wgpuDeviceCreateComputePipeline(WGPUDevice device, WGPUComputePipelineDescriptor const * descriptor);
     // WGPU_EXPORT void wgpuDeviceCreateComputePipelineAsync(WGPUDevice device, WGPUComputePipelineDescriptor const * descriptor, WGPUCreateComputePipelineAsyncCallback callback, void * userdata);
     // WGPU_EXPORT WGPUBuffer wgpuDeviceCreateErrorBuffer(WGPUDevice device);
@@ -83,7 +83,7 @@ pub inline fn destroy(device: Device) void {
     device.vtable.destroy(device.ptr);
 }
 
-pub inline fn createCommandEncoder(device: Device, descriptor: *const CommandEncoder.Descriptor) CommandEncoder {
+pub inline fn createCommandEncoder(device: Device, descriptor: ?*const CommandEncoder.Descriptor) CommandEncoder {
     return device.vtable.createCommandEncoder(device.ptr, descriptor);
 }
 
diff --git a/gpu/src/NativeInstance.zig b/gpu/src/NativeInstance.zig
index 113caf12..a24237f4 100644
--- a/gpu/src/NativeInstance.zig
+++ b/gpu/src/NativeInstance.zig
@@ -379,12 +379,12 @@ const device_vtable = Device.VTable{
         }
     }).destroy,
     .createCommandEncoder = (struct {
-        pub fn createCommandEncoder(ptr: *anyopaque, descriptor: *const CommandEncoder.Descriptor) CommandEncoder {
-            const desc = c.WGPUCommandEncoderDescriptor{
+        pub fn createCommandEncoder(ptr: *anyopaque, descriptor: ?*const CommandEncoder.Descriptor) CommandEncoder {
+            const desc: ?*c.WGPUCommandEncoderDescriptor = if (descriptor) |d| &.{
                 .nextInChain = null,
-                .label = descriptor.label,
-            };
-            return wrapCommandEncoder(c.wgpuDeviceCreateCommandEncoder(@ptrCast(c.WGPUDevice, ptr), &desc));
+                .label = d.label,
+            } else null;
+            return wrapCommandEncoder(c.wgpuDeviceCreateCommandEncoder(@ptrCast(c.WGPUDevice, ptr), desc));
         }
     }).createCommandEncoder,
     .createRenderPipeline = (struct {