1 files changed, 6 insertions, 0 deletions
diff --git a/ext/kv/01_db.ts b/ext/kv/01_db.ts
index 73deee27f..2b0e141f8 100644
--- a/ext/kv/01_db.ts
+++ b/ext/kv/01_db.ts
@@ -64,6 +64,7 @@ const kvSymbol = Symbol("KvRid");
 
 class Kv {
   #rid: number;
+  #isClosed: boolean;
 
   constructor(rid: number = undefined, symbol: symbol = undefined) {
     if (kvSymbol !== symbol) {
@@ -72,6 +73,7 @@ class Kv {
       );
     }
     this.#rid = rid;
+    this.#isClosed = false;
   }
 
   atomic() {
@@ -251,6 +253,9 @@ class Kv {
   async listenQueue(
     handler: (message: unknown) => Promise<void> | void,
   ): Promise<void> {
+    if (this.#isClosed) {
+      throw new Error("already closed");
+    }
     const finishMessageOps = new Map<number, Promise<void>>();
     while (true) {
       // Wait for the next message.
@@ -366,6 +371,7 @@ class Kv {
 
   close() {
     core.close(this.#rid);
+    this.#isClosed = true;
   }
 
   [SymbolDispose]() {