diff --git a/tasks/main.yml b/tasks/main.yml
index 67be48a866ba214be663d869c7108c4b33652f7b..d7c8d2e65f1168b6ea70de817fa6a4a25e891656 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -30,7 +30,6 @@
     mode: 0644
 
 - name: Create the SASL password lookup table
-  when: postfix__tables.sasl_passwd is defined and postfix__tables.sasl_passwd
   template:
     src: lookup_table.j2
     dest: /etc/postfix/sasl_passwd.in
@@ -38,11 +37,10 @@
     group: root
     mode: 0600
   vars:
-    table: '{{ postfix__tables.sasl_passwd }}'
+    table: '{{ postfix__tables.sasl_passwd | default({}) }}'
   notify: ['make postfix sasl_passwd.db']
 
 - name: Create the transport lookup table
-  when: postfix__tables.transport is defined and postfix__tables.transport
   template:
     src: lookup_table.j2
     dest: /etc/postfix/transport.in
@@ -50,7 +48,7 @@
     group: root
     mode: 0644
   vars:
-    table: '{{ postfix__tables.transport }}'
+    table: '{{ postfix__tables.transport | default({}) }}'
   notify: ['make postfix transport.db']
 
 - name: Mark the 'main.cf' file as being managed by Ansible