diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Content/ContentMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Content/ContentMapDefinition.cs
index 48e15b6da0..7d701069b1 100644
--- a/src/Umbraco.Cms.Api.Management/Mapping/Content/ContentMapDefinition.cs
+++ b/src/Umbraco.Cms.Api.Management/Mapping/Content/ContentMapDefinition.cs
@@ -48,7 +48,7 @@ public abstract class ContentMapDefinition<TContent, TPropertyViewModel, TVarian
     {
         IPropertyValue[] propertyValues = source.Properties.SelectMany(propertyCollection => propertyCollection.Values).ToArray();
         var cultures = source.AvailableCultures.DefaultIfEmpty(null).ToArray();
-        var segments = propertyValues.Select(property => property.Segment).Distinct().ToArray();
+        var segments = propertyValues.Select(property => property.Segment).Distinct().DefaultIfEmpty(null).ToArray();
 
         return cultures
             .SelectMany(culture => segments.Select(segment =>
diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs
index fbfcbc13d3..6051a093ac 100644
--- a/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs
+++ b/src/Umbraco.Cms.Api.Management/Mapping/Document/DocumentMapDefinition.cs
@@ -17,7 +17,6 @@ public class DocumentMapDefinition : ContentMapDefinition<IContent, DocumentProp
     public void DefineMaps(IUmbracoMapper mapper)
         => mapper.Define<IContent, DocumentViewModel>((_, _) => new DocumentViewModel(), Map);
 
-    // TODO: handle unpublished, non-variant content
     // Umbraco.Code.MapAll
     private void Map(IContent source, DocumentViewModel target, MapperContext context)
     {