diff --git a/defaults/main.yml b/defaults/main.yml
index 2960771..a9d8207 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -247,6 +247,7 @@ s3:
   access_key: 4cc355_k3y
   secret_access_key: s3cr3t_4cc355_k3y
   bucket_name: s3-test
+  cors_already_set: false
   create_bucket: true
   # for non-amazon services. for localstack, you might set
   #custom_endpoint_url: "http://localhost:4572"
diff --git a/tasks/s3.yml b/tasks/s3.yml
index 11609e1..dfa82e5 100644
--- a/tasks/s3.yml
+++ b/tasks/s3.yml
@@ -77,8 +77,8 @@
     owner: '{{ dataverse.payara.user }}'
     group: '{{ dataverse.payara.group }}'
     mode: 0644
-  when: s3.download_redirect == true or
-    s3.upload_redirect == true
+  when: (s3.download_redirect == true or s3.upload_redirect == true)
+    and s3.cors_already_set == false
 
 - name: enable CORS on S3 bucket
   shell:
@@ -89,9 +89,9 @@
   become_user: '{{ dataverse.payara.user }}'
   environment:
     PATH: "{{ lookup('env', 'PATH') }}:/usr/local/bin"
-  when: (s3.download_redirect == true or
-    s3.upload_redirect == true)
+  when: (s3.download_redirect == true or s3.upload_redirect == true)
     and custom_endpoint_url | length == 0
+    and s3.cors_already_set == false
 
 - include: s3_custom_endpoint_url.yml
   when: custom_endpoint_url | length > 0
diff --git a/tests/group_vars/jenkins.yml b/tests/group_vars/jenkins.yml
index bf43d67..248dc0d 100644
--- a/tests/group_vars/jenkins.yml
+++ b/tests/group_vars/jenkins.yml
@@ -241,6 +241,7 @@ s3:
   access_key: 4cc355_k3y
   secret_access_key: s3cr3t_4cc355_k3y
   bucket_name: s3-test
+  cors_already_set: false
   create_bucket: true
   # for non-amazon services.
   custom_endpoint_url: "http://localhost:4572"
diff --git a/tests/group_vars/memorytests.yml b/tests/group_vars/memorytests.yml
index 54cb04f..20e5b10 100644
--- a/tests/group_vars/memorytests.yml
+++ b/tests/group_vars/memorytests.yml
@@ -243,6 +243,7 @@ s3:
   access_key: 4cc355_k3y
   secret_access_key: s3cr3t_4cc355_k3y
   bucket_name: s3-test
+  cors_already_set: false
   create_bucket: true
   # for non-amazon services.
   custom_endpoint_url: "http://localhost:4572"
diff --git a/tests/group_vars/vagrant.yml b/tests/group_vars/vagrant.yml
index 6df4593..f4093c5 100644
--- a/tests/group_vars/vagrant.yml
+++ b/tests/group_vars/vagrant.yml
@@ -234,6 +234,7 @@ s3:
   secret_access_key: s3cr3t_4cc355_k3y
   bucket_name: s3-test
   create_bucket: true
+  cors_already_set: false
   # for non-amazon services. for localstack, you might set
   #custom_endpoint_url: "http://localhost:4572"
   custom_endpoint_url: