diff --git a/templates/layout/page.html.twig b/templates/layout/page.html.twig
index f6d0c1b..f50b4af 100644
--- a/templates/layout/page.html.twig
+++ b/templates/layout/page.html.twig
@@ -92,38 +92,40 @@
           {% endif %}
           </nav>
         {% endif %}
-        <nav{{ navbar_attributes }}>
-          {% if container_navbar %}
-          <div class="container">
-          {% endif %}
-            {{ page.header }}
-            {% if page.primary_menu or page.header_form %}
-              <button class="navbar-toggler collapsed" type="button" data-bs-toggle="{{ navbar_collapse_btn_data }}" data-bs-target="#CollapsingNavbar" aria-controls="CollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
-              <div class="{{ navbar_collapse_class }}" id="CollapsingNavbar">
-                {% if navbar_offcanvas %}
-                  <div class="offcanvas-header">
-                    <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
-                  </div>
-                  <div class="offcanvas-body">
-                {% endif %}
-                {{ page.primary_menu }}
-                {% if page.header_form %}
-                  <div class="form-inline navbar-form justify-content-end">
-                    {{ page.header_form }}
-                  </div>
-                {% endif %}
-                {% if navbar_offcanvas %}
-                  </div>
-                {% endif %}
-	            </div>
+        {% if page.header or page.primary_menu or page.header_form %}
+          <nav{{ navbar_attributes }}>
+            {% if container_navbar %}
+            <div class="container">
             {% endif %}
-            {% if sidebar_collapse %}
-              <button class="navbar-toggler navbar-toggler-left collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#CollapsingLeft" aria-controls="CollapsingLeft" aria-expanded="false" aria-label="Toggle navigation"></button>
+              {{ page.header }}
+              {% if page.primary_menu or page.header_form %}
+                <button class="navbar-toggler collapsed" type="button" data-bs-toggle="{{ navbar_collapse_btn_data }}" data-bs-target="#CollapsingNavbar" aria-controls="CollapsingNavbar" aria-expanded="false" aria-label="Toggle navigation"><span class="navbar-toggler-icon"></span></button>
+                <div class="{{ navbar_collapse_class }}" id="CollapsingNavbar">
+                  {% if navbar_offcanvas %}
+                    <div class="offcanvas-header">
+                      <button type="button" class="btn-close text-reset" data-bs-dismiss="offcanvas" aria-label="Close"></button>
+                    </div>
+                    <div class="offcanvas-body">
+                  {% endif %}
+                  {{ page.primary_menu }}
+                  {% if page.header_form %}
+                    <div class="form-inline navbar-form justify-content-end">
+                      {{ page.header_form }}
+                    </div>
+                  {% endif %}
+                  {% if navbar_offcanvas %}
+                    </div>
+                  {% endif %}
+                </div>
+              {% endif %}
+              {% if sidebar_collapse %}
+                <button class="navbar-toggler navbar-toggler-left collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#CollapsingLeft" aria-controls="CollapsingLeft" aria-expanded="false" aria-label="Toggle navigation"></button>
+              {% endif %}
+            {% if container_navbar %}
+            </div>
             {% endif %}
-          {% if container_navbar %}
-          </div>
-          {% endif %}
-        </nav>
+          </nav>
+        {% endif %}
       {% endblock %}
     </header>
     {% if page.highlighted %}