diff --git a/roles/jira_config/tasks/main.yml b/roles/jira_config/tasks/main.yml
index b438b45..6edc68d 100644
--- a/roles/jira_config/tasks/main.yml
+++ b/roles/jira_config/tasks/main.yml
@@ -46,7 +46,9 @@
     - "opensearch.http.url={{ atl_opensearch_endpoint }}"
     - "opensearch.aws.region={{ ansible_ec2_placement_region }}"
   when:
-    - atl_opensearch_endpoint is defined and atl_opensearch_endpoint | length > 0
+    - atl_opensearch_endpoint is defined
+    - atl_opensearch_endpoint is not none
+    - atl_opensearch_endpoint | length > 0
     - ansible_ec2_placement_region is defined
 
 - name: Override JVM memory settings.