diff --git a/tasks/main.yml b/tasks/main.yml
index 4b4fb52..a036cd9 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -48,7 +48,7 @@
     state: 'present'
   with_flattened: '{{ samba__kernel_modules }}'
   when: (('samba' in samba__base_packages) and
-        (samba__kernel_modules_load is defined and samba__kernel_modules_load ))
+        (samba__kernel_modules_load|bool))
 
 - name: Ensure kernel modules are loaded on system boot
   template:
@@ -58,7 +58,7 @@
     group: 'root'
     mode: '0644'
   when: (('samba' in samba__base_packages) and
-        (samba__kernel_modules_load is defined and samba__kernel_modules_load ))
+        (samba__kernel_modules_load|bool))
 
 - name: Remove legacy entries from /etc/modules
   lineinfile: