diff --git a/src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml b/src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml
index 3bc6308b55..22fd4283de 100644
--- a/src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/BlockList/Default.cshtml
@@ -8,6 +8,13 @@
     {
         if (layout?.Udi == null) { continue; }
         var data = layout.Data;
-        @Html.Partial("BlockList/Components/" + data.ContentType.Alias, layout)
+        try
+        {
+            @Html.Partial("BlockList/Components/" + data.ContentType.Alias, (data, layout.Settings))
+        }
+        catch (Exception ex)
+        {
+            global::Umbraco.Core.Composing.Current.Logger.Error(typeof(BlockListModel), ex, "Could not display block list component for content type {0}", data?.ContentType?.Alias);
+        }
     }
 </div>