diff --git a/packages/backend/src/controllers/webhooks/create.ts b/packages/backend/src/controllers/webhooks/handler.ts
similarity index 81%
rename from packages/backend/src/controllers/webhooks/create.ts
rename to packages/backend/src/controllers/webhooks/handler.ts
index a56f73e8..f79839f6 100644
--- a/packages/backend/src/controllers/webhooks/create.ts
+++ b/packages/backend/src/controllers/webhooks/handler.ts
@@ -1,11 +1,12 @@
-import { Request, Response } from 'express';
+import { Response } from 'express';
+import bcrypt from 'bcrypt';
+import { IRequest, ITriggerItem } from '@automatisch/types';
 
-import { ITriggerItem } from '@automatisch/types';
 import Flow from '../../models/flow';
 import triggerQueue from '../../queues/trigger';
 import globalVariable from '../../helpers/global-variable';
 
-export default async (request: Request, response: Response) => {
+export default async (request: IRequest, response: Response) => {
   const flow = await Flow.query()
     .findById(request.params.flowId)
     .throwIfNotFound();
@@ -23,7 +24,6 @@ export default async (request: Request, response: Response) => {
       connection: await triggerStep.$relatedQuery('connection'),
       app,
       step: triggerStep,
-      testRun: false,
       request,
     });
 
@@ -37,7 +37,7 @@ export default async (request: Request, response: Response) => {
   const triggerItem: ITriggerItem = {
     raw: request.body,
     meta: {
-      internalId: request.body.form_response.token,
+      internalId: await bcrypt.hash(request.rawBody, 1),
     },
   };
 
diff --git a/packages/backend/src/routes/webhooks.ts b/packages/backend/src/routes/webhooks.ts
index c08eced3..c26f4add 100644
--- a/packages/backend/src/routes/webhooks.ts
+++ b/packages/backend/src/routes/webhooks.ts
@@ -1,8 +1,8 @@
-import createAction from '../controllers/webhooks/create';
 import { Router } from 'express';
+import webhookHandler from '../controllers/webhooks/handler';
 
 const router = Router();
 
-router.post('/:flowId', createAction);
+router.post('/:flowId', webhookHandler);
 
 export default router;