diff --git a/roles/hackmd/tasks/main.yml b/roles/hackmd/tasks/main.yml
index 20889dd..9ec592d 100644
--- a/roles/hackmd/tasks/main.yml
+++ b/roles/hackmd/tasks/main.yml
@@ -39,7 +39,7 @@
   command: /usr/bin/npm run build chdir=/opt/codimd-{{ hackmd_version }}
   become: true
   become_user: hackmd
-  when: (hackmd_unarchive is defined and hackmd_unarchive.changed) or (hackmd_config is defined and hackmd_config.changed)
+  when: hackmd_unarchive.changed or hackmd_config.changed
 
 - name: Configure PostgreSQL database
   postgresql_db: name={{ hackmd_dbname }}
@@ -58,6 +58,7 @@
   command: node_modules/.bin/sequelize db:migrate chdir=/opt/codimd-{{ hackmd_version }}
   become: true
   become_user: hackmd
+  when: hackmd_unarchive.changed or hackmd_config.changed
 
 - name: Ensure certificates are available
   command: openssl req -x509 -nodes -newkey rsa:2048 -keyout /etc/nginx/ssl/{{ hackmd_domain }}.key -out /etc/nginx/ssl/{{ hackmd_domain }}.crt -days 730 -subj "/CN={{ hackmd_domain }}" creates=/etc/nginx/ssl/{{ hackmd_domain }}.crt