diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 95e7cd8..282a19a 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
+  when: profile_scripts.changed and not newhost
   tags: base-shell
 
 - name: run update-issue on change
   command: /usr/local/sbin/update-issue.sh
-  when: profile_scripts.changed
+  when: profile_scripts.changed and not newhost
   tags: base-shell
 
 # htop