diff --git a/packages/backend-core/src/middleware/tenancy.js b/packages/backend-core/src/middleware/tenancy.js
index a5dc735410..f4053d1f5b 100644
--- a/packages/backend-core/src/middleware/tenancy.js
+++ b/packages/backend-core/src/middleware/tenancy.js
@@ -1,4 +1,5 @@
 const { setTenantId, setGlobalDB, getGlobalDB } = require("../tenancy")
+const { closeDB } = require("../db")
 const ContextFactory = require("../context/FunctionContext")
 const { buildMatcherRegex, matches } = require("./matchers")
 
@@ -18,7 +19,8 @@ module.exports = (
     setGlobalDB(tenantId)
   }
   const destroyFn = async () => {
-    await getGlobalDB().close()
+    const db = getGlobalDB()
+    await closeDB(db)
   }
 
   return ContextFactory.getMiddleware(updateCtxFn, destroyFn)