diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index b6dc40f..b225617 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -8,4 +8,6 @@
 
 - import_tasks: install_docker.yml
 - import_tasks: install_portainer.yml
-  when: run_portainer == true
\ No newline at end of file
+  when:
+    - run_portainer is defined
+    - run_portainer == true
\ No newline at end of file