diff --git a/tasks/galera_client_install_apt.yml b/tasks/galera_client_install_apt.yml
index a95bfc6..5b9e71e 100644
--- a/tasks/galera_client_install_apt.yml
+++ b/tasks/galera_client_install_apt.yml
@@ -103,5 +103,6 @@
   retries: 5
   delay: 2
   with_items: "{{ galera_client_distro_packages }}"
+  when: "{{ item | length > 0 }}"
   tags:
     - galera-client-apt-packages
diff --git a/tasks/galera_client_install_yum.yml b/tasks/galera_client_install_yum.yml
index 1f1b1ed..5deaf7b 100644
--- a/tasks/galera_client_install_yum.yml
+++ b/tasks/galera_client_install_yum.yml
@@ -94,5 +94,6 @@
   retries: 5
   delay: 2
   with_items: "{{ galera_client_distro_packages }}"
+  when: "{{ item | length > 0 }}"
   tags:
     - galera-pre-yum-packages