diff --git a/plinth/templates/app.html b/plinth/templates/app.html
index ea43a9989..8e18f7994 100644
--- a/plinth/templates/app.html
+++ b/plinth/templates/app.html
@@ -86,9 +86,13 @@
     {% endif %}
   {% endblock %}
 
-  {% include "internal-zone.html" %}
+  {% block internal_zone %}
+    {% include "internal-zone.html" %}
+  {% endblock %}
 
-  {% include "port-forwarding-info.html" with service_name=name %}
+  {% block port_forwarding_info %}
+    {% include "port-forwarding-info.html" with service_name=name %}
+  {% endblock %}
 
   {% block configuration %}
     <h3>{% trans "Configuration" %}</h3>