diff --git a/lua/wikis/commons/Widget/Table2/Cell.lua b/lua/wikis/commons/Widget/Table2/Cell.lua
index 7ca1fec3633..51748499df1 100644
--- a/lua/wikis/commons/Widget/Table2/Cell.lua
+++ b/lua/wikis/commons/Widget/Table2/Cell.lua
@@ -43,7 +43,7 @@ local function Table2Cell(props, context)
 				props.align,
 				props.nowrap,
 				props.shrink,
-				props.attributes
+				ColumnUtil.buildAttributes(props)
 			),
 			classes = props.classes,
 			children = children,
diff --git a/lua/wikis/commons/Widget/Table2/CellHeader.lua b/lua/wikis/commons/Widget/Table2/CellHeader.lua
index 4230ed2f10d..6493d57ed88 100644
--- a/lua/wikis/commons/Widget/Table2/CellHeader.lua
+++ b/lua/wikis/commons/Widget/Table2/CellHeader.lua
@@ -52,7 +52,7 @@ local function Table2CellHeader(props, context)
 	-- Skip context lookups and property merging if there are no column definitions
 	if #columns == 0 then
 		local align = props.align
-		local attributes = props.attributes or {}
+		local attributes = ColumnUtil.buildAttributes(props)
 		if align == 'right' or align == 'center' then
 			attributes['data-align'] = align
 		end