diff --git a/tasks/main.yml b/tasks/main.yml
index 62d012f..45b6f9c 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,8 +2,8 @@
 # tasks file for external-port-connectivity-validator-server
 - name: Do not use proxy definitions
   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 == '')
 
 - name: Use proxy definitions
   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 != ''