diff --git a/_layouts/default.html b/_layouts/default.html
index 5bf27a980fa52f1ede859a61f2b005a373dd2241..9c333afb31f46aaeb55f113afeeb95974ddd3729 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -86,7 +86,7 @@ layout: table_wrappers
             </ul>
           {% endif %}
 
-          {% if site.footer_content != nil %}
+          {% if site.footer_content != nil or site.show_last_edit_time or site.show_gh_edit_link %}
             <hr>
             <footer role="contentinfo">
               {% if site.show_last_edit_time and site.last_edit_time_format and page.last_modified_date %}
@@ -99,7 +99,9 @@ layout: table_wrappers
                 <a href="{{ site.gh_edit_repository }}/tree/master/{{ page.path }}">Edit this page on GitHub.</a>
               </p>
               {% endif %}
+              {% if site.footer_content != nil %}
               <p class="text-small text-grey-dk-000 mb-0">{{ site.footer_content }}</p>
+              {% endif %}
             </footer>
           {% endif %}