diff --git a/tasks/main.yml b/tasks/main.yml
index abdfb3b..c906be0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,9 +1,9 @@
 ---
 - include: with_no_proxy.yml
-  when: http_proxy is not defined and https_proxy is not defined
+  when: (https_proxy is not defined or https_proxy | trim == '') and (http_proxy is not defined or http_proxy | trim == '')
 
 - include: with_proxy.yml
-  when: http_proxy is defined and https_proxy is defined
+  when: https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''
 
 
 - name: Update environment with path to JAVA_HOME