diff --git a/district/templates/district/blocks/homepage_header_block.html b/district/templates/district/blocks/homepage_header_block.html
index 6a6dd13c68612395718e9b634d38667e9c643e98..c759dfd0afa5059d37e1e20312ec9fbd5b54150d 100644
--- a/district/templates/district/blocks/homepage_header_block.html
+++ b/district/templates/district/blocks/homepage_header_block.html
@@ -8,15 +8,17 @@
 
     <div class="lg:row-span-1 lg:col-span-3 order-3">
       <div class="mt-4 md:mt-8 space-y-4 ">
-        <a href="{{ self.button_link }}"
-           class="btn btn--icon btn--hoveractive btn--fullwidth md:btn--autowidth text-lg">
-          <div class="btn__body-wrap">
-            <div class="btn__body ">{{ self.button_text }}</div>
-            <div class="btn__icon ">
-              <i class="ico--chevron-right"></i>
+        {% if self.button_link and self.button_text %}
+          <a href="{{ self.button_link }}"
+             class="btn btn--icon btn--hoveractive btn--fullwidth md:btn--autowidth text-lg">
+            <div class="btn__body-wrap">
+              <div class="btn__body ">{{ self.button_text }}</div>
+              <div class="btn__icon ">
+                <i class="ico--chevron-right"></i>
+              </div>
             </div>
-          </div>
-        </a>
+          </a>
+        {% endif %}
       </div>
     </div>
 
diff --git a/region/templates/region/blocks/homepage_header_block.html b/region/templates/region/blocks/homepage_header_block.html
index 6a6dd13c68612395718e9b634d38667e9c643e98..c759dfd0afa5059d37e1e20312ec9fbd5b54150d 100644
--- a/region/templates/region/blocks/homepage_header_block.html
+++ b/region/templates/region/blocks/homepage_header_block.html
@@ -8,15 +8,17 @@
 
     <div class="lg:row-span-1 lg:col-span-3 order-3">
       <div class="mt-4 md:mt-8 space-y-4 ">
-        <a href="{{ self.button_link }}"
-           class="btn btn--icon btn--hoveractive btn--fullwidth md:btn--autowidth text-lg">
-          <div class="btn__body-wrap">
-            <div class="btn__body ">{{ self.button_text }}</div>
-            <div class="btn__icon ">
-              <i class="ico--chevron-right"></i>
+        {% if self.button_link and self.button_text %}
+          <a href="{{ self.button_link }}"
+             class="btn btn--icon btn--hoveractive btn--fullwidth md:btn--autowidth text-lg">
+            <div class="btn__body-wrap">
+              <div class="btn__body ">{{ self.button_text }}</div>
+              <div class="btn__icon ">
+                <i class="ico--chevron-right"></i>
+              </div>
             </div>
-          </div>
-        </a>
+          </a>
+        {% endif %}
       </div>
     </div>