diff --git a/src/WSI/BUILD.gn b/src/WSI/BUILD.gn
index f1feb31..6a55805 100644
--- a/src/WSI/BUILD.gn
+++ b/src/WSI/BUILD.gn
@@ -14,6 +14,15 @@
 
 import("../swiftshader.gni")
 
+config("WSI_metal_weak_framework") {
+  if (is_mac) {
+    ldflags = [
+      "-weak_framework",
+      "Metal",
+    ]
+  }
+}
+
 swiftshader_source_set("WSI") {
   sources = [
     "VkSurfaceKHR.cpp",
@@ -42,13 +51,14 @@
 
   if (is_mac) {
     sources += [
-      "MetalSurface.mm",
       "MetalSurface.h",
+      "MetalSurface.mm",
     ]
     libs = [
       "Cocoa.framework",
       "QuartzCore.framework",
     ]
+    public_configs = [ ":WSI_metal_weak_framework" ]
   }
 
   include_dirs = [
@@ -63,5 +73,5 @@
     "../Vulkan:swiftshader_libvulkan_headers",
   ]
 
-  configs = [ "../Vulkan:swiftshader_libvulkan_private_config", ]
+  configs = [ "../Vulkan:swiftshader_libvulkan_private_config" ]
 }
diff --git a/src/WSI/MetalSurface.mm b/src/WSI/MetalSurface.mm
index c31248a..f88689e 100644
--- a/src/WSI/MetalSurface.mm
+++ b/src/WSI/MetalSurface.mm
@@ -40,6 +40,7 @@
         {
             layer = (CAMetalLayer*)[obj retain];
             layer.framebufferOnly = false;
+            layer.device = MTLCreateSystemDefaultDevice();
         }
         else
         {
@@ -68,6 +69,7 @@
     {
         if(layer)
         {
+            [layer.device release];
             [layer release];
         }
         if(view)