diff --git a/tasks/main.yml b/tasks/main.yml
index bd3d724..5c94167 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -2,11 +2,12 @@
 # tasks file for apigee-opdk-setup-component
 - name: Use no 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 != ''
+
 
 - name: Wait for ready
   ignore_errors: "{{ ignore_errors | default('no') }}"