diff --git a/docs/nextConfigDocsInfra.js b/docs/nextConfigDocsInfra.js
index b5e7a45f170b9d..45495d63175cf7 100644
--- a/docs/nextConfigDocsInfra.js
+++ b/docs/nextConfigDocsInfra.js
@@ -49,7 +49,7 @@ process.env.DEPLOY_ENV = DEPLOY_ENV;
 function withDocsInfra(nextConfig) {
   return {
     trailingSlash: true,
-    // Can be turned on when https://github.com/vercel/next.js/issues/24640 is fixed
+    // TODO: Remove when upgrading to Next.js 15, see https://github.com/vercel/next.js/pull/69137
     optimizeFonts: false,
     reactStrictMode: true,
     ...nextConfig,