diff --git a/pkg/models/listeners.go b/pkg/models/listeners.go
index b0f9e665b4e..397ab51b162 100644
--- a/pkg/models/listeners.go
+++ b/pkg/models/listeners.go
@@ -66,22 +66,24 @@ func RegisterListeners() {
 		events.RegisterListener((&TaskDeletedEvent{}).Name(), &RemoveTaskFromTypesense{})
 		events.RegisterListener((&TaskCreatedEvent{}).Name(), &AddTaskToTypesense{})
 	}
-	RegisterEventForWebhook(&TaskCreatedEvent{})
-	RegisterEventForWebhook(&TaskUpdatedEvent{})
-	RegisterEventForWebhook(&TaskDeletedEvent{})
-	RegisterEventForWebhook(&TaskAssigneeCreatedEvent{})
-	RegisterEventForWebhook(&TaskAssigneeDeletedEvent{})
-	RegisterEventForWebhook(&TaskCommentCreatedEvent{})
-	RegisterEventForWebhook(&TaskCommentUpdatedEvent{})
-	RegisterEventForWebhook(&TaskCommentDeletedEvent{})
-	RegisterEventForWebhook(&TaskAttachmentCreatedEvent{})
-	RegisterEventForWebhook(&TaskAttachmentDeletedEvent{})
-	RegisterEventForWebhook(&TaskRelationCreatedEvent{})
-	RegisterEventForWebhook(&TaskRelationDeletedEvent{})
-	RegisterEventForWebhook(&ProjectUpdatedEvent{})
-	RegisterEventForWebhook(&ProjectDeletedEvent{})
-	RegisterEventForWebhook(&ProjectSharedWithUserEvent{})
-	RegisterEventForWebhook(&ProjectSharedWithTeamEvent{})
+	if config.WebhooksEnabled.GetBool() {
+		RegisterEventForWebhook(&TaskCreatedEvent{})
+		RegisterEventForWebhook(&TaskUpdatedEvent{})
+		RegisterEventForWebhook(&TaskDeletedEvent{})
+		RegisterEventForWebhook(&TaskAssigneeCreatedEvent{})
+		RegisterEventForWebhook(&TaskAssigneeDeletedEvent{})
+		RegisterEventForWebhook(&TaskCommentCreatedEvent{})
+		RegisterEventForWebhook(&TaskCommentUpdatedEvent{})
+		RegisterEventForWebhook(&TaskCommentDeletedEvent{})
+		RegisterEventForWebhook(&TaskAttachmentCreatedEvent{})
+		RegisterEventForWebhook(&TaskAttachmentDeletedEvent{})
+		RegisterEventForWebhook(&TaskRelationCreatedEvent{})
+		RegisterEventForWebhook(&TaskRelationDeletedEvent{})
+		RegisterEventForWebhook(&ProjectUpdatedEvent{})
+		RegisterEventForWebhook(&ProjectDeletedEvent{})
+		RegisterEventForWebhook(&ProjectSharedWithUserEvent{})
+		RegisterEventForWebhook(&ProjectSharedWithTeamEvent{})
+	}
 }
 
 //////
diff --git a/pkg/models/webhooks.go b/pkg/models/webhooks.go
index 39dc5c575d8..afedc7ed588 100644
--- a/pkg/models/webhooks.go
+++ b/pkg/models/webhooks.go
@@ -72,10 +72,6 @@ func init() {
 }
 
 func RegisterEventForWebhook(event events.Event) {
-	if !config.WebhooksEnabled.GetBool() {
-		return
-	}
-
 	availableWebhookEventsLock.Lock()
 	defer availableWebhookEventsLock.Unlock()