diff --git a/connectors/webhook/element-templates/webhook-connector-boundary.json b/connectors/webhook/element-templates/webhook-connector-boundary.json
index bfc64547d8..aed27a54f9 100644
--- a/connectors/webhook/element-templates/webhook-connector-boundary.json
+++ b/connectors/webhook/element-templates/webhook-connector-boundary.json
@@ -83,7 +83,6 @@
         "message" : "can only contain letters, numbers, or single underscores/hyphens and cannot begin or end with an underscore/hyphen"
       }
     },
-    "feel" : "optional",
     "group" : "endpoint",
     "binding" : {
       "name" : "inbound.context",
diff --git a/connectors/webhook/element-templates/webhook-connector-intermediate.json b/connectors/webhook/element-templates/webhook-connector-intermediate.json
index 64e6df5fae..fa3074ca9a 100644
--- a/connectors/webhook/element-templates/webhook-connector-intermediate.json
+++ b/connectors/webhook/element-templates/webhook-connector-intermediate.json
@@ -83,7 +83,6 @@
         "message" : "can only contain letters, numbers, or single underscores/hyphens and cannot begin or end with an underscore/hyphen"
       }
     },
-    "feel" : "optional",
     "group" : "endpoint",
     "binding" : {
       "name" : "inbound.context",
diff --git a/connectors/webhook/element-templates/webhook-connector-start-event.json b/connectors/webhook/element-templates/webhook-connector-start-event.json
index a71198fc34..40c372be58 100644
--- a/connectors/webhook/element-templates/webhook-connector-start-event.json
+++ b/connectors/webhook/element-templates/webhook-connector-start-event.json
@@ -79,7 +79,6 @@
         "message" : "can only contain letters, numbers, or single underscores/hyphens and cannot begin or end with an underscore/hyphen"
       }
     },
-    "feel" : "optional",
     "group" : "endpoint",
     "binding" : {
       "name" : "inbound.context",
diff --git a/connectors/webhook/element-templates/webhook-connector-start-message.json b/connectors/webhook/element-templates/webhook-connector-start-message.json
index 0824788aa1..8b62f11144 100644
--- a/connectors/webhook/element-templates/webhook-connector-start-message.json
+++ b/connectors/webhook/element-templates/webhook-connector-start-message.json
@@ -83,7 +83,6 @@
         "message" : "can only contain letters, numbers, or single underscores/hyphens and cannot begin or end with an underscore/hyphen"
       }
     },
-    "feel" : "optional",
     "group" : "endpoint",
     "binding" : {
       "name" : "inbound.context",
diff --git a/element-template-generator/core/src/main/java/io/camunda/connector/generator/java/processor/TemplatePropertyFieldProcessor.java b/element-template-generator/core/src/main/java/io/camunda/connector/generator/java/processor/TemplatePropertyFieldProcessor.java
index b7a4e66c35..831d70e008 100644
--- a/element-template-generator/core/src/main/java/io/camunda/connector/generator/java/processor/TemplatePropertyFieldProcessor.java
+++ b/element-template-generator/core/src/main/java/io/camunda/connector/generator/java/processor/TemplatePropertyFieldProcessor.java
@@ -17,7 +17,6 @@
 package io.camunda.connector.generator.java.processor;
 
 import io.camunda.connector.generator.dsl.DropdownProperty.DropdownPropertyBuilder;
-import io.camunda.connector.generator.dsl.Property.FeelMode;
 import io.camunda.connector.generator.dsl.PropertyBuilder;
 import io.camunda.connector.generator.dsl.PropertyCondition;
 import io.camunda.connector.generator.dsl.PropertyConstraints;
@@ -35,7 +34,7 @@ public void process(Field field, PropertyBuilder builder) {
       return;
     }
     builder.optional(annotation.optional());
-    if (annotation.feel() != FeelMode.disabled && !(builder instanceof DropdownPropertyBuilder)) {
+    if (!(builder instanceof DropdownPropertyBuilder)) {
       builder.feel(annotation.feel());
     }
     if (!annotation.label().isBlank()) {