diff --git a/core/server/api/v3/webhooks.js b/core/server/api/v3/webhooks.js
index 7dbd263b62..a114213c15 100644
--- a/core/server/api/v3/webhooks.js
+++ b/core/server/api/v3/webhooks.js
@@ -15,23 +15,6 @@ module.exports = {
         data: [],
         permissions: true,
         async query(frame) {
-            const isIntegrationRequest = frame.options.context && frame.options.context.integration && frame.options.context.integration.id;
-
-            // NOTE: this check can be removed once `webhooks.integration_id` gets foreigh ke constraint (Ghost 4.0)
-            if (!isIntegrationRequest && frame.data.webhooks[0].integration_id) {
-                const integration = await models.Integration.findOne({id: frame.data.webhooks[0].integration_id}, {context: {internal: true}});
-
-                if (!integration) {
-                    throw new errors.ValidationError({
-                        message: i18n.t('notices.data.validation.index.schemaValidationFailed', {
-                            key: 'integration_id'
-                        }),
-                        context: i18n.t('errors.api.webhooks.nonExistingIntegrationIdProvided.context'),
-                        help: i18n.t('errors.api.webhooks.nonExistingIntegrationIdProvided.help')
-                    });
-                }
-            }
-
             const webhook = await models.Webhook.getByEventAndTarget(
                 frame.data.webhooks[0].event,
                 frame.data.webhooks[0].target_url,
@@ -42,7 +25,20 @@ module.exports = {
                 throw new errors.ValidationError({message: i18n.t('errors.api.webhooks.webhookAlreadyExists')});
             }
 
-            return models.Webhook.add(frame.data.webhooks[0], frame.options);
+            try {
+                const newWebhook = await models.Webhook.add(frame.data.webhooks[0], frame.options);
+                return newWebhook;
+            } catch (error) {
+                if (error.errno === 1452 || (error.code === 'SQLITE_CONSTRAINT' && /SQLITE_CONSTRAINT: FOREIGN KEY constraint failed/.test(error.message))) {
+                    throw new errors.ValidationError({
+                        message: i18n.t('notices.data.validation.index.schemaValidationFailed', {
+                            key: 'integration_id'
+                        }),
+                        context: i18n.t('errors.api.webhooks.nonExistingIntegrationIdProvided.context'),
+                        help: i18n.t('errors.api.webhooks.nonExistingIntegrationIdProvided.help')
+                    });
+                }
+            }
         }
     },