diff --git a/include/proxy-wasm/wasm.h b/include/proxy-wasm/wasm.h
index e77b9b03..c4cf0a0b 100644
--- a/include/proxy-wasm/wasm.h
+++ b/include/proxy-wasm/wasm.h
@@ -290,7 +290,11 @@ class WasmHandleBase : public std::enable_shared_from_this<WasmHandleBase> {
     }
   }
 
-  void kill() { wasm_base_ = nullptr; }
+  void kill() {
+    wasm_base_->startShutdown();
+    wasm_base_->finishShutdown();
+    wasm_base_ = nullptr;
+  }
 
   std::shared_ptr<WasmBase> &wasm() { return wasm_base_; }