diff --git a/module/settings/system-compendiums.js b/module/settings/system-compendiums.js
index 5700bde7..be1af7d1 100644
--- a/module/settings/system-compendiums.js
+++ b/module/settings/system-compendiums.js
@@ -52,7 +52,7 @@ export class SystemCompendiums extends FormApplication {
   }
 
   static getPack(compendium) {
-    return game.packs.get(SystemCompendiums.getCompendium(compendium));
+    return game.packs.get(SystemCompendiums.getCompendium(compendium)) ?? game.packs.get(SystemCompendiums._getDefaultCompendium(compendium));
   }
 
   static async getPackContent(compendium, docType) {
@@ -213,11 +213,11 @@ export class CompendiumTableHelpers {
     let max = 0;
     const total = elements.map(it => itemFrequence(it)).reduce(Misc.sum(), 0);
     return elements.map(it => {
-        const frequence = itemFrequence(it);
-        let row = { document: it, frequence: frequence, min: max + 1, max: max + frequence, total: total };
-        max += frequence;
-        return row;
-      });
+      const frequence = itemFrequence(it);
+      let row = { document: it, frequence: frequence, min: max + 1, max: max + frequence, total: total };
+      max += frequence;
+      return row;
+    });
   }
 
   static async getRandom(table, type, subTypes, forcedRoll = undefined, localisation = undefined) {