diff --git a/src/library.js b/src/library.js
index aab41cd1fa86..4093f3b3d23c 100644
--- a/src/library.js
+++ b/src/library.js
@@ -58,11 +58,10 @@ addToLibrary({
       for (var i = 0; i < size; i++) {
         HEAPU8[address + i] = 0;
       }
-      return;
+      return address;
     }
 #endif
-    HEAPU8.fill(0, address, address + size);
-    return address;
+    return HEAPU8.fill(0, address, address + size);
   },
 
 #if SAFE_HEAP
diff --git a/src/library_webgpu.js b/src/library_webgpu.js
index 8988ee7c441f..3cb44a52c386 100644
--- a/src/library_webgpu.js
+++ b/src/library_webgpu.js
@@ -2023,7 +2023,7 @@ var LibraryWebGPU = {
 
   // In webgpu.h offset and size are passed in as size_t.
   // And library_webgpu assumes that size_t is always 32bit in emscripten.
-  wgpuBufferGetMappedRange__deps: ['$warnOnce', 'memalign', 'free'],
+  wgpuBufferGetMappedRange__deps: ['$warnOnce', '$zeroMemory', 'memalign', 'free'],
   wgpuBufferGetMappedRange: (bufferId, offset, size) => {
     var bufferWrapper = WebGPU.mgrBuffer.objects[bufferId];
     {{{ gpu.makeCheckDefined('bufferWrapper') }}}
@@ -2052,7 +2052,7 @@ var LibraryWebGPU = {
     }
 
     var data = _memalign(16, mapped.byteLength);
-    HEAPU8.fill(0, data, mapped.byteLength);
+    zeroMemory(data, mapped.byteLength);
     bufferWrapper.onUnmap.push(() => {
       new Uint8Array(mapped).set(HEAPU8.subarray(data, data + mapped.byteLength));
       _free(data);