diff --git a/tasks/main.yml b/tasks/main.yml
index 8705566..5e33286 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -32,9 +32,9 @@
 
 - name: Do not use proxy definitions
   include: with_no_proxy.yml
-  when: opdk_version | version_compare('4.16', '>=') and http_proxy is not defined and https_proxy is not defined
+  when: opdk_version | version_compare('4.16', '>=') and (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: opdk_version | version_compare('4.16', '>=') and http_proxy is defined and https_proxy is defined
+  when: opdk_version | version_compare('4.16', '>=') and https_proxy is defined and https_proxy | trim != '' and http_proxy is defined and http_proxy | trim != ''