diff --git a/baker/SiteBaker.tsx b/baker/SiteBaker.tsx
index 24ca2315cc..29dc2c2c93 100644
--- a/baker/SiteBaker.tsx
+++ b/baker/SiteBaker.tsx
@@ -348,7 +348,7 @@ export class SiteBaker {
     _prefetchedAttachmentsCache: PrefetchedAttachments | undefined = undefined
     private async getPrefetchedGdocAttachments(
         knex: db.KnexReadonlyTransaction,
-        picks?: [string[], string[], string[], string[], string[]]
+        picks?: [string[], string[], string[], string[], string[], string[]]
     ): Promise<PrefetchedAttachments> {
         if (!this._prefetchedAttachmentsCache) {
             console.log("Prefetching attachments...")
@@ -490,6 +490,7 @@ export class SiteBaker {
                 imageFilenames,
                 linkedGrapherSlugs,
                 linkedExplorerSlugs,
+                linkedNarrativeChartNames,
             ] = picks
             const linkedDocuments = pick(
                 this._prefetchedAttachmentsCache.linkedDocuments,
@@ -538,8 +539,10 @@ export class SiteBaker {
                     this._prefetchedAttachmentsCache.linkedAuthors.filter(
                         (author) => authorNames.includes(author.name)
                     ),
-                narrativeViewsInfo:
-                    this._prefetchedAttachmentsCache.narrativeViewsInfo, // TODO: Filter
+                narrativeViewsInfo: pick(
+                    this._prefetchedAttachmentsCache.narrativeViewsInfo,
+                    linkedNarrativeChartNames
+                ),
             }
         }
         return this._prefetchedAttachmentsCache
@@ -631,6 +634,7 @@ export class SiteBaker {
                 publishedGdoc.linkedImageFilenames,
                 publishedGdoc.linkedChartSlugs.grapher,
                 publishedGdoc.linkedChartSlugs.explorer,
+                publishedGdoc.linkedNarrativeChartNames,
             ])
             publishedGdoc.donors = attachments.donors
             publishedGdoc.linkedAuthors = attachments.linkedAuthors
@@ -889,6 +893,7 @@ export class SiteBaker {
                 dataInsight.linkedImageFilenames,
                 dataInsight.linkedChartSlugs.grapher,
                 dataInsight.linkedChartSlugs.explorer,
+                dataInsight.linkedNarrativeChartNames,
             ])
             dataInsight.linkedDocuments = attachments.linkedDocuments
             dataInsight.imageMetadata = {
@@ -962,6 +967,7 @@ export class SiteBaker {
                 publishedAuthor.linkedImageFilenames,
                 publishedAuthor.linkedChartSlugs.grapher,
                 publishedAuthor.linkedChartSlugs.explorer,
+                publishedAuthor.linkedNarrativeChartNames,
             ])
 
             // We don't need these to be attached to the gdoc in the current
diff --git a/db/model/Gdoc/GdocBase.ts b/db/model/Gdoc/GdocBase.ts
index 9b842eff81..d1ce0c3994 100644
--- a/db/model/Gdoc/GdocBase.ts
+++ b/db/model/Gdoc/GdocBase.ts
@@ -295,6 +295,14 @@ export class GdocBase implements OwidGdocBaseInterface {
         return { grapher: [...grapher], explorer: [...explorer] }
     }
 
+    get linkedNarrativeChartNames(): string[] {
+        const filteredLinks = this.links
+            .filter((link) => link.linkType === "narrative-chart")
+            .map((link) => link.target)
+
+        return filteredLinks
+    }
+
     get hasAllChartsBlock(): boolean {
         let hasAllChartsBlock = false
         for (const enrichedBlockSource of this.enrichedBlockSources) {
@@ -703,8 +711,10 @@ export class GdocBase implements OwidGdocBaseInterface {
     async loadNarrativeViewsInfo(
         knex: db.KnexReadonlyTransaction
     ): Promise<void> {
-        // TODO: Filter down to only those that are used in the Gdoc
-        const result = await getNarrativeViewsInfo(knex)
+        const result = await getNarrativeViewsInfo(
+            knex,
+            this.linkedNarrativeChartNames
+        )
         this.narrativeViewsInfo = keyBy(result, "name")
     }