diff --git a/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ContentReferencesExtensions.cs b/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ContentReferencesExtensions.cs
index 6fb83a936..f4eeabb58 100644
--- a/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ContentReferencesExtensions.cs
+++ b/src/Squidex.Domain.Apps.Core.Operations/ExtractReferenceIds/ContentReferencesExtensions.cs
@@ -56,7 +56,14 @@ namespace Squidex.Domain.Apps.Core.ExtractReferenceIds
         {
             Guard.NotNull(schema, nameof(schema));
 
-            foreach (var field in schema.Fields)
+            return GetReferencedIds(source, schema.Fields, strategy);
+        }
+
+        public static IEnumerable<Guid> GetReferencedIds(this NamedContentData source, IEnumerable<IField> fields, Ids strategy = Ids.All)
+        {
+            Guard.NotNull(fields, nameof(fields));
+
+            foreach (var field in fields)
             {
                 var ids = source.GetReferencedIds(field, strategy);
 
diff --git a/src/Squidex.Domain.Apps.Entities/Contents/ContentEnricher.cs b/src/Squidex.Domain.Apps.Entities/Contents/ContentEnricher.cs
index 5228024db..841b06e3c 100644
--- a/src/Squidex.Domain.Apps.Entities/Contents/ContentEnricher.cs
+++ b/src/Squidex.Domain.Apps.Entities/Contents/ContentEnricher.cs
@@ -175,7 +175,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
 
             foreach (var content in contents)
             {
-                ids.AddRange(content.DataDraft.GetReferencedIds(schema.SchemaDef, Ids.ContentOnly));
+                ids.AddRange(content.DataDraft.GetReferencedIds(schema.SchemaDef.ResolvingReferences(), Ids.ContentOnly));
             }
 
             if (ids.Count > 0)