diff --git a/Sources/SwiftDocC/Infrastructure/ConvertActionConverter.swift b/Sources/SwiftDocC/Infrastructure/ConvertActionConverter.swift
index 0f6efa172..efee0c5ed 100644
--- a/Sources/SwiftDocC/Infrastructure/ConvertActionConverter.swift
+++ b/Sources/SwiftDocC/Infrastructure/ConvertActionConverter.swift
@@ -103,6 +103,22 @@ package enum ConvertActionConverter {
         let resultsSyncQueue = DispatchQueue(label: "Convert Serial Queue", qos: .unspecified, attributes: [])
         let resultsGroup = DispatchGroup()
         
+        let linkHierarchySerializationProblems = Synchronized<[Problem]>([])
+        if FeatureFlags.current.isLinkHierarchySerializationEnabled {
+            resultsGroup.async(queue: resultsSyncQueue) {
+                signposter.withIntervalSignpost("Serialize link hierarchy", id: signposter.makeSignpostID()) {
+                    do {
+                        let serializableLinkInformation = try context.linkResolver.localResolver.prepareForSerialization(bundleID: bundle.id)
+                        try outputConsumer.consume(linkResolutionInformation: serializableLinkInformation)
+                    } catch {
+                        linkHierarchySerializationProblems.sync {
+                            recordProblem(from: error, in: &$0, withIdentifier: "link-resolver")
+                        }
+                    }
+                }
+            }
+        }
+        
         let renderSignpostHandle = signposter.beginInterval("Render", id: signposter.makeSignpostID(), "Render \(context.knownPages.count) pages")
         
         var conversionProblems: [Problem] = context.knownPages.concurrentPerform { identifier, results in
@@ -164,44 +180,25 @@ package enum ConvertActionConverter {
         // Wait for any concurrent updates to complete.
         resultsGroup.wait()
         
+        conversionProblems += linkHierarchySerializationProblems.sync { $0 }
+        
         signposter.endInterval("Render", renderSignpostHandle)
         
         guard !Task.isCancelled else { return [] }
         
         // Write various metadata
-        if emitDigest {
+        if emitDigest || FeatureFlags.current.isLinkHierarchySerializationEnabled {
             signposter.withIntervalSignpost("Emit digest", id: signposter.makeSignpostID()) {
                 do {
                     try outputConsumer.finishedConsumingLinkElementSummaries()
-                    try outputConsumer.consume(indexingRecords: indexingRecords)
-                    try outputConsumer.consume(assets: assets)
-                } catch {
-                    recordProblem(from: error, in: &conversionProblems, withIdentifier: "metadata")
-                }
-            }
-        }
-        
-        if FeatureFlags.current.isLinkHierarchySerializationEnabled {
-            signposter.withIntervalSignpost("Serialize link hierarchy", id: signposter.makeSignpostID()) {
-                do {
-                    let serializableLinkInformation = try context.linkResolver.localResolver.prepareForSerialization(bundleID: bundle.id)
-                    try outputConsumer.consume(linkResolutionInformation: serializableLinkInformation)
-                    
-                    if !emitDigest {
-                        try outputConsumer.finishedConsumingLinkElementSummaries()
+                    if emitDigest {
+                        // Only emit the other digest files if `--emit-digest` is passed
+                        try outputConsumer.consume(indexingRecords: indexingRecords)
+                        try outputConsumer.consume(assets: assets)
+                        try outputConsumer.consume(problems: context.problems + conversionProblems)
                     }
                 } catch {
-                    recordProblem(from: error, in: &conversionProblems, withIdentifier: "link-resolver")
-                }
-            }
-        }
-        
-        if emitDigest {
-            signposter.withIntervalSignpost("Emit digest", id: signposter.makeSignpostID()) {
-                do {
-                    try outputConsumer.consume(problems: context.problems + conversionProblems)
-                } catch {
-                    recordProblem(from: error, in: &conversionProblems, withIdentifier: "problems")
+                    recordProblem(from: error, in: &conversionProblems, withIdentifier: "metadata")
                 }
             }
         }