diff --git a/roles/mediawiki/tasks/main.yml b/roles/mediawiki/tasks/main.yml
index ee96ee73b..8e2d8999e 100644
--- a/roles/mediawiki/tasks/main.yml
+++ b/roles/mediawiki/tasks/main.yml
@@ -1,7 +1,8 @@
-- name: Install MediaWiki {{ mediawiki_version }} if mediawiki_install
+- name: Install MediaWiki {{ mediawiki_version }}
   include_tasks: install.yml
-  when: mediawiki_install | bool and not mediawiki_installed is defined
+  when: mediawiki_install and not mediawiki_installed is defined
 
-- name: Install MediaWiki {{ mediawiki_version }} if mediawiki_install
+- name: Enable MediaWiki
   include_tasks: enable.yml
-  when: mediawiki_install | bool or mediawiki_installed is defined
+  when: mediawiki_install or mediawiki_installed is defined
+  # when: mediawiki_enabled