diff --git a/templates/table/colonnade.hamlet b/templates/table/colonnade.hamlet
index ef6b1bdbd..90951ce7c 100644
--- a/templates/table/colonnade.hamlet
+++ b/templates/table/colonnade.hamlet
@@ -1,10 +1,17 @@
-<table id="#{dbtIdent}">
-  $maybe sortableP <- pSortable
-    $with toSortable <- toSortable sortableP
-      <thead>
-        $forall OneColonnade{..} <- getColonnade dbtColonnade
-          ^{widgetFromCell th $ withSortLinks $ toSortable oneColonnadeHead}
-  $nothing
+$if not psShortcircuit
+  <table id="#{dbtIdent}">
+    $maybe sortableP <- pSortable
+      $with toSortable <- toSortable sortableP
+        <thead>
+          $forall OneColonnade{..} <- getColonnade dbtColonnade
+            ^{widgetFromCell th $ withSortLinks $ toSortable oneColonnadeHead}
+    $nothing
+    <tbody>
+      $forall row <- rows
+        <tr>
+          $forall OneColonnade{..} <- getColonnade dbtColonnade
+            ^{widgetFromCell td $ oneColonnadeEncode row}
+$else
   <tbody>
     $forall row <- rows
       <tr>