diff --git a/web/genericl10n.js b/web/genericl10n.js
index 87feb67fe4230..05ac48209d9ee 100644
--- a/web/genericl10n.js
+++ b/web/genericl10n.js
@@ -45,8 +45,18 @@ class GenericL10n extends L10n {
    */
   static async *#generateBundles(defaultLang, baseLang) {
     const { baseURL, paths } = await this.#getPaths();
-    const langs =
-      baseLang === defaultLang ? [baseLang] : [baseLang, defaultLang];
+
+    const langs = [baseLang];
+    if (defaultLang !== baseLang) {
+      // Also fallback to the short-format of the base language
+      // (see issue 17269).
+      const shortLang = baseLang.split("-", 1)[0];
+
+      if (shortLang !== baseLang) {
+        langs.push(shortLang);
+      }
+      langs.push(defaultLang);
+    }
     for (const lang of langs) {
       const bundle = await this.#createBundle(lang, baseURL, paths);
       if (bundle) {