diff --git a/src/Umbraco.Web/PropertyEditors/ValueConverters/NestedContentPublishedPropertyTypeExtensions.cs b/src/Umbraco.Web/PropertyEditors/ValueConverters/NestedContentPublishedPropertyTypeExtensions.cs
index cb26ef6786..ebfdbd33d3 100644
--- a/src/Umbraco.Web/PropertyEditors/ValueConverters/NestedContentPublishedPropertyTypeExtensions.cs
+++ b/src/Umbraco.Web/PropertyEditors/ValueConverters/NestedContentPublishedPropertyTypeExtensions.cs
@@ -108,7 +108,7 @@ namespace Umbraco.Web.PropertyEditors.ValueConverters
                             i,
                             preview);
 
-                        if (PublishedContentModelFactoryResolver.HasCurrent)
+                        if (PublishedContentModelFactoryResolver.HasCurrent && PublishedContentModelFactoryResolver.Current.HasValue)
                         {
                             // Let the current model factory create a typed model to wrap our model
                             content = PublishedContentModelFactoryResolver.Current.Factory.CreateModel(content);