diff --git a/templates/table/layout-wrapper.hamlet b/templates/table/layout-wrapper.hamlet
index 1092c126f..3073c58df 100644
--- a/templates/table/layout-wrapper.hamlet
+++ b/templates/table/layout-wrapper.hamlet
@@ -1,3 +1,3 @@
 $newline never
-<div ##{wIdent "table-wrapper"} uw-async-table data-async-table-db-header=#{toPathPiece HeaderDBTableShortcircuit}>
+<div ##{wIdent "table-wrapper"} :not $ null rows && (dbsEmptyStyle == DBESNoHeading):uw-async-table data-async-table-db-header=#{toPathPiece HeaderDBTableShortcircuit}>
   ^{table}