diff --git a/compiler/gen_wasm/src/backend.rs b/compiler/gen_wasm/src/backend.rs
index ffeb2a5dfa..a783106aef 100644
--- a/compiler/gen_wasm/src/backend.rs
+++ b/compiler/gen_wasm/src/backend.rs
@@ -178,15 +178,18 @@ impl<'a> WasmBackend<'a> {
     fn start_proc(&mut self, proc: &Proc<'a>) {
         let ret_layout = WasmLayout::new(&proc.ret_layout);
         let ret_type = if ret_layout.is_stack_memory() {
-            self.storage.arg_types.push(PTR_TYPE);
-            self.start_block(BlockType::NoResult); // block to ensure all paths pop stack memory (if any)
+            if ret_layout.size() != 0 {
+                self.storage.arg_types.push(PTR_TYPE);
+            }
             None
         } else {
-            let ty = ret_layout.value_type();
-            self.start_block(BlockType::Value(ty)); // block to ensure all paths pop stack memory (if any)
-            Some(ty)
+            Some(ret_layout.value_type())
         };
 
+        // Create a block so we can exit the function without skipping stack frame "pop" code.
+        // We never use the `return` instruction. Instead, we break from this block.
+        self.start_block(BlockType::from(ret_type));
+
         for (layout, symbol) in proc.args {
             let arg_layout = WasmLayout::new(layout);
             self.storage
@@ -767,7 +770,9 @@ impl<'a> WasmBackend<'a> {
                             );
                         }
                     } else {
-                        return Err(format!("Not supported yet: zero-size struct at {:?}", sym));
+                        // Zero-size struct. No code to emit.
+                        // These values are purely conceptual, they only exist internally in the compiler
+                        return Ok(());
                     }
                 }
                 _ => {
diff --git a/compiler/gen_wasm/src/wasm_module/code_builder.rs b/compiler/gen_wasm/src/wasm_module/code_builder.rs
index 2109f3e436..5eb73247e9 100644
--- a/compiler/gen_wasm/src/wasm_module/code_builder.rs
+++ b/compiler/gen_wasm/src/wasm_module/code_builder.rs
@@ -50,6 +50,15 @@ impl BlockType {
     }
 }
 
+impl From<Option<ValueType>> for BlockType {
+    fn from(opt: Option<ValueType>) -> Self {
+        match opt {
+            Some(ty) => BlockType::Value(ty),
+            None => BlockType::NoResult,
+        }
+    }
+}
+
 /// A control block in our model of the VM
 /// Child blocks cannot "see" values from their parent block
 struct VmBlock<'a> {