diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 282a19a..85f1c60 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -664,12 +664,12 @@
 
 - name: run update-motd on change
   command: /usr/local/sbin/update-motd.sh
-  when: profile_scripts.changed and not newhost
+  when: profile_scripts.changed and newhost is not defined and not newhost
   tags: base-shell
 
 - name: run update-issue on change
   command: /usr/local/sbin/update-issue.sh
-  when: profile_scripts.changed and not newhost
+  when: profile_scripts.changed and newhost is not defined and not newhost
   tags: base-shell
 
 # htop