diff --git a/group_vars/all.yml b/group_vars/all.yml
index 7117f78a..988f69c2 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -1157,25 +1157,25 @@ magento_core_config_settings_default:
     path: "web/secure/base_media_url"
     value: "https://{{ aws_cloudfront_distribution_domain | default('') }}/"
     default: "{{ aws_cloudfront_domain_aliases | default([]) | length > 0 }}"
-    enabled: "{{ aws_cloudfront_distribution_domain | default(false) is string }}"
+    enabled: "{{ aws_cloudfront_distribution_domain is string and aws_cloudfront_distribution_create | default(false) | bool }}"
 
   - name: Set secure static url to cloudfront domain
     path: "web/secure/base_static_url"
     value: "https://{{ aws_cloudfront_distribution_domain | default('') }}/static/"
     default: "{{ aws_cloudfront_domain_aliases | default([]) | length > 0 }}"
-    enabled: "{{ aws_cloudfront_distribution_domain | default(false) is string }}"
+    enabled: "{{ aws_cloudfront_distribution_domain is string and aws_cloudfront_distribution_create | default(false) | bool }}"
 
   - name: Set unsecure media url to cloudfront domain
     path: "web/secure/base_media_url"
     value: "https://{{ aws_cloudfront_distribution_domain | default('') }}/"
     default: "{{ aws_cloudfront_domain_aliases | default([]) | length > 0 }}"
-    enabled: "{{ aws_cloudfront_distribution_domain | default(false) is string }}"
+    enabled: "{{ aws_cloudfront_distribution_domain is string and aws_cloudfront_distribution_create | default(false) | bool }}"
 
   - name: Set unsecure static url to cloudfront domain
     path: "web/secure/base_static_url"
     value: "https://{{ aws_cloudfront_distribution_domain | default('') }}/static/"
     default: "{{ aws_cloudfront_domain_aliases | default([]) | length > 0 }}"
-    enabled: "{{ aws_cloudfront_distribution_domain | default(false) is string }}"
+    enabled: "{{ aws_cloudfront_distribution_domain is string and aws_cloudfront_distribution_create | default(false) | bool }}"
 
 
 # Extra core config settings to be set at deploy,