diff --git a/src/Umbraco.Core/EmbeddedResources/BlockGrid/default.cshtml b/src/Umbraco.Core/EmbeddedResources/BlockGrid/default.cshtml
index 4065bfdd03..2a298ddaf5 100644
--- a/src/Umbraco.Core/EmbeddedResources/BlockGrid/default.cshtml
+++ b/src/Umbraco.Core/EmbeddedResources/BlockGrid/default.cshtml
@@ -2,10 +2,9 @@
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridModel>
 @{
     if (Model?.Any() != true) { return; }
+    var gridColumns = Model.GridColumns?.ToString() ?? "12";
 }
 
-<div class="umb-block-grid"
-     data-grid-columns="@(Model.GridColumns?.ToString() ?? "12");"
-     style="--umb-block-grid--grid-columns: @(Model.GridColumns?.ToString() ?? "12");">
+<div class="umb-block-grid" data-grid-columns="@(gridColumns)" style="--umb-block-grid--grid-columns: @(gridColumns);">
     @await Html.GetBlockGridItemsHtmlAsync(Model)
 </div>
diff --git a/src/Umbraco.Web.UI/Views/Partials/blockgrid/default.cshtml b/src/Umbraco.Web.UI/Views/Partials/blockgrid/default.cshtml
index e25839ebb1..db6a793a91 100644
--- a/src/Umbraco.Web.UI/Views/Partials/blockgrid/default.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/blockgrid/default.cshtml
@@ -2,10 +2,9 @@
 @inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockGridModel>
 @{
     if (Model?.Any() != true) { return; }
+    var gridColumns = Model.GridColumns?.ToString() ?? "12";
 }
 
-<div class="umb-block-grid"
-     data-grid-columns="@(Model.GridColumns?.ToString() ?? "12");"
-     style="--umb-block-grid--grid-columns: @(Model.GridColumns?.ToString() ?? "12");">
+<div class="umb-block-grid" data-grid-columns="@(gridColumns)" style="--umb-block-grid--grid-columns: @(gridColumns);">
     @await Html.GetBlockGridItemsHtmlAsync(Model)
 </div>
diff --git a/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml b/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml
index accca2ef37..a79ea11547 100644
--- a/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/blocklist/default.cshtml
@@ -5,7 +5,7 @@
 <div class="umb-block-list">
     @foreach (var block in Model)
     {
-        if (block?.ContentUdi == null) { continue; }
+        if (block?.ContentKey == null) { continue; }
         var data = block.Content;
 
         @await Html.PartialAsync("blocklist/Components/" + data.ContentType.Alias, block)