diff --git a/branding/tasks/main.yml b/branding/tasks/main.yml
index 3d97bd904976c8250f90597cafd6b707a9b430d0..a532d3f3b3871c5fcce5cb71f56ceb4c417950ee 100644
--- a/branding/tasks/main.yml
+++ b/branding/tasks/main.yml
@@ -8,7 +8,9 @@
     owner: root
     group: root
     mode: 0644
-  when: branding_motd
+  when:
+    - branding_motd is defined
+    - branding_motd != ""
   tags:
     - branding
     - shell
@@ -20,7 +22,9 @@
     owner: root
     group: root
     mode: 0644
-  when: branding_issuenet
+  when:
+    - branding_issuenet is defined
+    - branding_issuenet != ""
   tags:
     - branding
     - shell