diff --git a/templates/Page.ss b/templates/Page.ss
index e45e3c0..d0c3213 100755
--- a/templates/Page.ss
+++ b/templates/Page.ss
@@ -16,7 +16,10 @@
         </header>
 
         <main id="MainContent" class="page-content" data-ajax-region="LayoutAjax">
-            <% include MainContent Layout=$Layout %>
+            <% if $isFormResponse %>
+                <%-- Legacy code compatibility --%>
+                <% include MainContent Layout=$Layout %>
+            <% end_if %>
         </main>
     </div>