diff --git a/packages/core/src/ActiveWebhooks.ts b/packages/core/src/ActiveWebhooks.ts
index 69bc731b08..5b69fab246 100644
--- a/packages/core/src/ActiveWebhooks.ts
+++ b/packages/core/src/ActiveWebhooks.ts
@@ -50,20 +50,20 @@ export class ActiveWebhooks {
 		// it gets called
 		this.webhookUrls[webhookKey] = webhookData;
 
-		const webhookExists = await workflow.runWebhookMethod('checkExists', webhookData, NodeExecuteFunctions, mode, this.testWebhooks);
-		if (webhookExists === false) {
-			// If webhook does not exist yet create it
-			try {
+		try {
+			const webhookExists = await workflow.runWebhookMethod('checkExists', webhookData, NodeExecuteFunctions, mode, this.testWebhooks);
+			if (webhookExists === false) {
+				// If webhook does not exist yet create it
 				await workflow.runWebhookMethod('create', webhookData, NodeExecuteFunctions, mode, this.testWebhooks);
-			} catch (error) {
-				// If there was a problem unregister the webhook again
-				delete this.webhookUrls[webhookKey];
-				delete this.workflowWebhooks[webhookData.workflowId];
 
-				throw error;
 			}
-		}
+		} catch (error) {
+			// If there was a problem unregister the webhook again
+			delete this.webhookUrls[webhookKey];
+			delete this.workflowWebhooks[webhookData.workflowId];
 
+			throw error;
+		}
 		this.workflowWebhooks[webhookData.workflowId].push(webhookData);
 	}