diff --git a/core/themes/classy/templates/views/views-view.html.twig b/core/themes/classy/templates/views/views-view.html.twig
index f0ed63c..36aff78 100644
--- a/core/themes/classy/templates/views/views-view.html.twig
+++ b/core/themes/classy/templates/views/views-view.html.twig
@@ -45,7 +45,7 @@
     {{ title }}
   {% endif %}
   {{ title_suffix }}
-  {% if header %}
+  {% if header and rows %}
     <div class="view-header">
       {{ header }}
     </div>
@@ -82,7 +82,7 @@
   {% if more %}
     {{ more }}
   {% endif %}
-  {% if footer %}
+  {% if footer and rows %}
     <div class="view-footer">
       {{ footer }}
     </div>