diff --git a/gpu/src/Device.zig b/gpu/src/Device.zig
index 4d7df47e..f8985c94 100644
--- a/gpu/src/Device.zig
+++ b/gpu/src/Device.zig
@@ -37,7 +37,7 @@ pub const VTable = struct {
     // WGPU_EXPORT void wgpuDeviceCreateRenderPipelineAsync(WGPUDevice device, WGPURenderPipelineDescriptor const * descriptor, WGPUCreateRenderPipelineAsyncCallback callback, void * userdata);
     // WGPU_EXPORT WGPUSampler wgpuDeviceCreateSampler(WGPUDevice device, WGPUSamplerDescriptor const * descriptor);
     createShaderModule: fn (ptr: *anyopaque, descriptor: *const ShaderModule.Descriptor) ShaderModule,
-    nativeCreateSwapChain: fn (ptr: *anyopaque, surface: Surface, descriptor: SwapChain.Descriptor) SwapChain,
+    nativeCreateSwapChain: fn (ptr: *anyopaque, surface: ?Surface, descriptor: SwapChain.Descriptor) SwapChain,
     // WGPU_EXPORT WGPUTexture wgpuDeviceCreateTexture(WGPUDevice device, WGPUTextureDescriptor const * descriptor);
     // WGPU_EXPORT void wgpuDeviceDestroy(WGPUDevice device);
     // WGPU_EXPORT size_t wgpuDeviceEnumerateFeatures(WGPUDevice device, WGPUFeatureName * features);
@@ -73,7 +73,7 @@ pub inline fn createShaderModule(device: Device, descriptor: *const ShaderModule
     return device.vtable.createShaderModule(device.ptr, descriptor);
 }
 
-pub inline fn nativeCreateSwapChain(device: Device, surface: Surface, descriptor: SwapChain.Descriptor) SwapChain {
+pub inline fn nativeCreateSwapChain(device: Device, surface: ?Surface, descriptor: SwapChain.Descriptor) SwapChain {
     return device.vtable.nativeCreateSwapChain(device.ptr, surface, descriptor);
 }
 
diff --git a/gpu/src/NativeInstance.zig b/gpu/src/NativeInstance.zig
index 799e9aa7..54edf1d4 100644
--- a/gpu/src/NativeInstance.zig
+++ b/gpu/src/NativeInstance.zig
@@ -343,7 +343,7 @@ const device_vtable = Device.VTable{
         }
     }).createShaderModule,
     .nativeCreateSwapChain = (struct {
-        pub fn nativeCreateSwapChain(ptr: *anyopaque, surface: Surface, descriptor: SwapChain.Descriptor) SwapChain {
+        pub fn nativeCreateSwapChain(ptr: *anyopaque, surface: ?Surface, descriptor: SwapChain.Descriptor) SwapChain {
             const desc = c.WGPUSwapChainDescriptor{
                 .nextInChain = null,
                 .label = if (descriptor.label) |l| @ptrCast([*c]const u8, l) else null,
@@ -356,7 +356,7 @@ const device_vtable = Device.VTable{
             };
             return wrapSwapChain(c.wgpuDeviceCreateSwapChain(
                 @ptrCast(c.WGPUDevice, ptr),
-                @ptrCast(c.WGPUSurface, surface.ptr),
+                if (surface) |surf| @ptrCast(c.WGPUSurface, surf.ptr) else null,
                 &desc,
             ));
         }