diff --git a/packages/server/src/threads/utils.js b/packages/server/src/threads/utils.js
index 13e9daf711..48b40d7002 100644
--- a/packages/server/src/threads/utils.js
+++ b/packages/server/src/threads/utils.js
@@ -3,6 +3,10 @@ const CouchDB = require("../db")
 const { init } = require("@budibase/auth")
 
 exports.threadSetup = () => {
+  // don't run this if not threading
+  if (env.isTest() || env.DISABLE_THREADING) {
+    return
+  }
   // when thread starts, make sure it is recorded
   env.setInThread()
   init(CouchDB)