diff --git a/roles/splunk_heavy_forwarder/tasks/main.yml b/roles/splunk_heavy_forwarder/tasks/main.yml
index 01965812..6ef84578 100644
--- a/roles/splunk_heavy_forwarder/tasks/main.yml
+++ b/roles/splunk_heavy_forwarder/tasks/main.yml
@@ -1,5 +1,9 @@
 ---
 - include_tasks: ../../../roles/splunk_common/tasks/set_as_hec_receiver.yml
+  when: 
+    - splunk.hec.enable is defined
+    - splunk.hec.enable
+
 
 - include_tasks: ../../../roles/splunk_common/tasks/set_as_deployment_client.yml
   when:
diff --git a/roles/splunk_indexer/tasks/main.yml b/roles/splunk_indexer/tasks/main.yml
index 5888b1f4..0390f9da 100644
--- a/roles/splunk_indexer/tasks/main.yml
+++ b/roles/splunk_indexer/tasks/main.yml
@@ -1,5 +1,8 @@
 ---
 - include_tasks: ../../../roles/splunk_common/tasks/set_as_hec_receiver.yml
+  when:
+    - splunk.hec.enable is defined
+    - splunk.hec.enable
 
 - include_tasks: indexer_clustering.yml
   when: splunk_indexer_cluster | bool
diff --git a/roles/splunk_standalone/tasks/main.yml b/roles/splunk_standalone/tasks/main.yml
index f3917e39..78ef4667 100644
--- a/roles/splunk_standalone/tasks/main.yml
+++ b/roles/splunk_standalone/tasks/main.yml
@@ -1,5 +1,8 @@
 ---
 - include_tasks: ../../splunk_common/tasks/set_as_hec_receiver.yml
+  when:
+    - splunk.hec.enable is defined
+    - splunk.hec.enable
 
 - include_tasks: ../../splunk_common/tasks/add_splunk_object.yml
   when: splunk.add is defined
diff --git a/roles/splunk_universal_forwarder/tasks/main.yml b/roles/splunk_universal_forwarder/tasks/main.yml
index 96ec4956..4ea8ebb0 100644
--- a/roles/splunk_universal_forwarder/tasks/main.yml
+++ b/roles/splunk_universal_forwarder/tasks/main.yml
@@ -1,5 +1,8 @@
 ---
 - include_tasks: ../../../roles/splunk_common/tasks/set_as_hec_receiver.yml
+  when:
+    - splunk.hec.enable is defined
+    - splunk.hec.enable
 
 - include_tasks: ../../../roles/splunk_common/tasks/set_as_deployment_client.yml
   when: