diff --git a/loader/wsi.c b/loader/wsi.c
index a8fdc3fd9..46c81b9ee 100644
--- a/loader/wsi.c
+++ b/loader/wsi.c
@@ -631,7 +631,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateWin32SurfaceKHR(VkInstance insta
         }
     }
 
-    *pSurface = (VkSurfaceKHR)(pIcdSurface);
+    *pSurface = (VkSurfaceKHR)(uintptr_t)pIcdSurface;
 
 out:
 
@@ -1595,7 +1595,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateMetalSurfaceEXT(VkInstance insta
             }
         }
     }
-    *pSurface = (VkSurfaceKHR)icd_surface;
+    *pSurface = (VkSurfaceKHR)(uintptr_t)icd_surface;
 
 out:
     if (result != VK_SUCCESS && icd_surface != NULL) {
@@ -2571,7 +2571,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateImagePipeSurfaceFUCHSIA(VkInstan
         }
     }
 
-    *pSurface = (VkSurfaceKHR)(pIcdSurface);
+    *pSurface = (VkSurfaceKHR)(uintptr_t)pIcdSurface;
 
 out: