diff --git a/roles/float-util-geoip-base/tasks/main.yml b/roles/float-util-geoip-base/tasks/main.yml
index 2bdc7148ebd1c5e2dc1dd62f87a1ddd1e9f7008d..b1191c296a9e15c4b74cd27fc7041a2d641c6c2e 100644
--- a/roles/float-util-geoip-base/tasks/main.yml
+++ b/roles/float-util-geoip-base/tasks/main.yml
@@ -4,5 +4,6 @@
   apt:
     name: geoipupdate
     state: present
+  when: geoip_account_id is defined
 
 
diff --git a/roles/float-util-geoip-dataset/tasks/main.yml b/roles/float-util-geoip-dataset/tasks/main.yml
index 7d6c87dc347ea946e3dcc418a174d9d8a784f2f8..6f8afe11529ae8424595006c540d5f81b686d089 100644
--- a/roles/float-util-geoip-dataset/tasks/main.yml
+++ b/roles/float-util-geoip-dataset/tasks/main.yml
@@ -16,3 +16,5 @@
     dest: "/etc/cron.d/geoipupdate_{{ item }}"
     content: "12 0 * * 5 root /usr/local/bin/splay 3600 && /usr/bin/geoipupdate -f /etc/GeoIP_{{ item }}.conf\n"
   with_items: "{{ geoip_dataset }}"
+  when: geoip_account_id is defined
+