diff --git a/group_vars/all/00_general.yml b/group_vars/all/00_general.yml
index a18536c7..84c3a53e 100644
--- a/group_vars/all/00_general.yml
+++ b/group_vars/all/00_general.yml
@@ -98,5 +98,5 @@ CAPTCHA:
     KEY:    "" 
     SECRET: ""
 
-RECAPTCHA_ENABLED: "{{ (CAPTCHA.RECAPTCHA.KEY | length > 0) and (CAPTCHA.RECAPTCHA.SECRET | length > 0) }}"
-HCAPTCHA_ENABLED:  "{{ (CAPTCHA.HCAPTCHA.KEY | length > 0) and (CAPTCHA.HCAPTCHA.SECRET | length > 0) }}"
+RECAPTCHA_ENABLED: "{{ CAPTCHA.RECAPTCHA.KEY | default('') | length and CAPTCHA.RECAPTCHA.SECRET | default('') | length }}"
+HCAPTCHA_ENABLED:  "{{ CAPTCHA.HCAPTCHA.KEY | default('') | length and CAPTCHA.HCAPTCHA.SECRET | default('') | length }}"
diff --git a/roles/web-app-espocrm/config/main.yml b/roles/web-app-espocrm/config/main.yml
index cd5e2c7b..c743ff6b 100644
--- a/roles/web-app-espocrm/config/main.yml
+++ b/roles/web-app-espocrm/config/main.yml
@@ -32,8 +32,8 @@ email:
   from_name: "Customer Relationship Management ({{ PRIMARY_DOMAIN }})"
 credentials:
   recaptcha:
-    key:  "{{ CAPTCHA.RECAPTCHA.KEY }}"
-    secret:   "{{ CAPTCHA.RECAPTCHA.SECRET }}"
+    key:      "{{ CAPTCHA.RECAPTCHA.KEY | default('') }}"
+    secret:   "{{ CAPTCHA.RECAPTCHA.SECRET | default('') }}"
 docker:
   services:
     database:
diff --git a/roles/web-app-keycloak/config/main.yml b/roles/web-app-keycloak/config/main.yml
index 6e29dcc0..42f560e7 100644
--- a/roles/web-app-keycloak/config/main.yml
+++ b/roles/web-app-keycloak/config/main.yml
@@ -47,8 +47,8 @@ docker:
       enabled: true
 credentials:
   recaptcha:
-    key:  "{{ CAPTCHA.RECAPTCHA.KEY }}"
-    secret:   "{{ CAPTCHA.RECAPTCHA.SECRET }}"
+    key:      "{{ CAPTCHA.RECAPTCHA.KEY | default('') }}"
+    secret:   "{{ CAPTCHA.RECAPTCHA.SECRET | default('') }}"
 accounts:
   bootstrap:
     username: "administrator"
diff --git a/roles/web-app-listmonk/config/main.yml b/roles/web-app-listmonk/config/main.yml
index eb196c7b..83c8c81d 100644
--- a/roles/web-app-listmonk/config/main.yml
+++ b/roles/web-app-listmonk/config/main.yml
@@ -31,5 +31,5 @@ docker:
       port:               9000
 credentials:
   hcaptcha:
-    key:    "{{ CAPTCHA.HCAPTCHA.KEY }}"
-    secret: "{{ CAPTCHA.HCAPTCHA.SECRET }}"
\ No newline at end of file
+    key:    "{{ CAPTCHA.HCAPTCHA.KEY | default('') }}"
+    secret: "{{ CAPTCHA.HCAPTCHA.SECRET | default('') }}"
\ No newline at end of file