diff --git a/playbook.yml b/playbook.yml
index 50d7bce..a7e628b 100644
--- a/playbook.yml
+++ b/playbook.yml
@@ -3,7 +3,7 @@
   become: yes
   roles:
     - { role: base, tags: ['base'] }
-    - { role: grub, tags: ['grub'] }
+    - { role: grub, tags: ['grub'], when: "bootloader == 'grub'"}
     - { role: sudo, tags: ['sudo'] }
     - { role: gnupg, tags: ['gnupg'] }
     - { role: sysmon, tags: ['sysmon'] }
diff --git a/roles/grub/tasks/main.yml b/roles/grub/tasks/main.yml
index f23ab35..c26ad29 100644
--- a/roles/grub/tasks/main.yml
+++ b/roles/grub/tasks/main.yml
@@ -5,7 +5,7 @@
     regexp: '^GRUB_CMDLINE_LINUX_DEFAULT'
     state: present
     line: 'GRUB_CMDLINE_LINUX_DEFAULT="{{ kernel_parameters }}"'
-  when: kernel_parameters is defined and bootloader == 'grub'
+  when: kernel_parameters is defined
   notify:
     - rebuild grub
 
@@ -15,6 +15,5 @@
     regexp: '^GRUB_DISABLE_SUBMENU'
     state: present
     line: 'GRUB_DISABLE_SUBMENU=y'
-  when: bootloader == 'grub'
   notify:
     - rebuild grub