diff --git a/packages/server/src/api/controllers/script.ts b/packages/server/src/api/controllers/script.ts
index 8af339b0b5..d5b99d0733 100644
--- a/packages/server/src/api/controllers/script.ts
+++ b/packages/server/src/api/controllers/script.ts
@@ -1,12 +1,12 @@
 import ScriptRunner from "../../utilities/scriptRunner"
-import { BBContext } from "@budibase/types"
+import { Ctx } from "@budibase/types"
 
-export async function execute(ctx: BBContext) {
+export async function execute(ctx: Ctx) {
   const { script, context } = ctx.request.body
   const runner = new ScriptRunner(script, context)
   ctx.body = runner.execute()
 }
 
-export async function save(ctx: BBContext) {
+export async function save(ctx: Ctx) {
   ctx.throw(501, "Not currently implemented")
 }
diff --git a/packages/server/src/utilities/scriptRunner.ts b/packages/server/src/utilities/scriptRunner.ts
index 616e787d90..fe59117466 100644
--- a/packages/server/src/utilities/scriptRunner.ts
+++ b/packages/server/src/utilities/scriptRunner.ts
@@ -1,4 +1,4 @@
-import ivm, { Context, Script } from "isolated-vm"
+import ivm from "isolated-vm"
 
 const JS_TIMEOUT_MS = 1000
 
@@ -9,8 +9,7 @@ class ScriptRunner {
     const code = `let fn = () => {\n${script}\n}; results.out = fn();`
     this.vm = new IsolatedVM({ memoryLimit: 8 })
     this.vm.context = {
-      data: context.data,
-      params: context.params,
+      ...context,
       results: { out: "" },
     }
     this.vm.code = code