From 6d65aab8399495b2a9e30c3bc4d7247dcbd63b81 Mon Sep 17 00:00:00 2001
From: Sarah Norris <sarah@sekai.co.uk>
Date: Thu, 25 Jul 2024 10:51:09 +0100
Subject: [PATCH] Check for themeFontFamilies and customFontFamilies

---
 packages/edit-site/src/components/global-styles/utils.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/edit-site/src/components/global-styles/utils.js b/packages/edit-site/src/components/global-styles/utils.js
index 34d2ffe4cfb969..66a25854a06fe1 100644
--- a/packages/edit-site/src/components/global-styles/utils.js
+++ b/packages/edit-site/src/components/global-styles/utils.js
@@ -57,9 +57,13 @@ export function getFontFamilies( themeJson ) {
 	const customFontFamilies =
 		themeJson?.settings?.typography?.fontFamilies?.custom;
 
-	let fontFamilies = themeFontFamilies;
-	if ( customFontFamilies ) {
+	let fontFamilies = [];
+	if ( themeFontFamilies && customFontFamilies ) {
 		fontFamilies = [ ...themeFontFamilies, ...customFontFamilies ];
+	} else if ( themeFontFamilies ) {
+		fontFamilies = themeFontFamilies;
+	} else if ( customFontFamilies ) {
+		fontFamilies = customFontFamilies;
 	}
 	const bodyFontFamilySetting = themeJson?.styles?.typography?.fontFamily;
 	const bodyFontFamily = getFontFamilyFromSetting(