diff --git a/roles/install-docker/tasks/mirror.yaml b/roles/install-docker/tasks/mirror.yaml
index 16820fef5..a80868e4c 100644
--- a/roles/install-docker/tasks/mirror.yaml
+++ b/roles/install-docker/tasks/mirror.yaml
@@ -7,6 +7,7 @@
 - name: Set docker_mirror fact for upstream docker
   when:
     - docker_mirror is not defined
+    - mirror_fqdn is defined
     - use_upstream_docker
   set_fact:
     docker_mirror: "http://{{ mirror_fqdn }}:8082"
@@ -14,12 +15,15 @@
 - name: Set docker_mirror fact for distro docker
   when:
     - docker_mirror is not defined
+    - mirror_fqdn is defined
     - not use_upstream_docker
   set_fact:
     docker_mirror: "http://{{ mirror_fqdn }}:8081/registry-1.docker/"
 
 - name: Install dockerhub proxy configuration
   become: yes
+  when:
+    - docker_mirror is defined
   template:
     dest: /etc/docker/daemon.json
     group: root