diff --git a/README.md b/README.md
index 68030b5e1..dd5aa2dea 100644
--- a/README.md
+++ b/README.md
@@ -100,7 +100,7 @@ A config file looks like this:
 ```yaml
 name: "My CodeQL config"
 
-ignore-default-queries: true
+disable-default-queries: true
 
 queries:
   - name: In-repo queries (Runs the queries located in the my-queries folder of the repo)
diff --git a/lib/finalize-db.js b/lib/finalize-db.js
index b9a33f155..0082161f4 100644
--- a/lib/finalize-db.js
+++ b/lib/finalize-db.js
@@ -92,7 +92,7 @@ async function runQueries(codeqlCmd, databaseFolder, sarifFolder, config) {
         if (!config.disableDefaultQueries) {
             queries.push(database + '-code-scanning.qls');
         }
-        queries.push(...queriesPerLanguage[database]);
+        queries.push(...(queriesPerLanguage[database] || []));
         const sarifFile = path.join(sarifFolder, database + '.sarif');
         await exec.exec(codeqlCmd, [
             'database',
diff --git a/src/finalize-db.ts b/src/finalize-db.ts
index f0f60e828..c897f95c8 100644
--- a/src/finalize-db.ts
+++ b/src/finalize-db.ts
@@ -106,7 +106,7 @@ async function runQueries(codeqlCmd: string, databaseFolder: string, sarifFolder
     if (!config.disableDefaultQueries) {
       queries.push(database + '-code-scanning.qls');
     }
-    queries.push(...queriesPerLanguage[database]);
+    queries.push(...(queriesPerLanguage[database] || []));
 
     const sarifFile = path.join(sarifFolder, database + '.sarif');