diff --git a/src/core/font_substitutions.js b/src/core/font_substitutions.js
index 67283c932..9ad26b707 100644
--- a/src/core/font_substitutions.js
+++ b/src/core/font_substitutions.js
@@ -484,10 +484,12 @@ function getFontSubstitution(
     src.push(`local(${baseFontName})`);
   }
   const { style, ultimate } = generateFont(substitution, src, localFontPath);
+  const guessFallback = ultimate === null;
+  const fallback = guessFallback ? "" : `,${ultimate}`;
 
   substitutionInfo = {
-    css: `${loadedName},${ultimate}`,
-    guessFallback: false,
+    css: `${loadedName}${fallback}`,
+    guessFallback,
     loadedName,
     baseFontName,
     src: src.join(","),