diff --git a/build/lib/policies.js b/build/lib/policies.js
index 7b1bbdf394acd..83ca05abc8953 100644
--- a/build/lib/policies.js
+++ b/build/lib/policies.js
@@ -438,8 +438,20 @@ async function getNLS(resourceUrlTemplate, languageId, version) {
     }
     catch (err) {
         if (/\[404\]/.test(err.message)) {
-            console.warn(`Language pack ${languageId}@${version} is missing. Downloading previous version...`);
-            return await getSpecificNLS(resourceUrlTemplate, languageId, previousVersion(version));
+            const thePreviousVersion = previousVersion(version);
+            console.warn(`Language pack ${languageId}@${version} is missing. Downloading previous version ${thePreviousVersion}...`);
+            try {
+                return await getSpecificNLS(resourceUrlTemplate, languageId, thePreviousVersion);
+            }
+            catch (err) {
+                if (/\[404\]/.test(err.message)) {
+                    console.warn(`Language pack ${languageId}@${thePreviousVersion} is missing. Downloading previous version...`);
+                    return await getSpecificNLS(resourceUrlTemplate, languageId, previousVersion(thePreviousVersion));
+                }
+                else {
+                    throw err;
+                }
+            }
         }
         else {
             throw err;
diff --git a/build/lib/policies.ts b/build/lib/policies.ts
index eaa8cb719a25f..cd3997e4e1df1 100644
--- a/build/lib/policies.ts
+++ b/build/lib/policies.ts
@@ -622,8 +622,18 @@ async function getNLS(resourceUrlTemplate: string, languageId: string, version:
 		return await getSpecificNLS(resourceUrlTemplate, languageId, version);
 	} catch (err) {
 		if (/\[404\]/.test(err.message)) {
-			console.warn(`Language pack ${languageId}@${version} is missing. Downloading previous version...`);
-			return await getSpecificNLS(resourceUrlTemplate, languageId, previousVersion(version));
+			const thePreviousVersion = previousVersion(version);
+			console.warn(`Language pack ${languageId}@${version} is missing. Downloading previous version ${thePreviousVersion}...`);
+			try {
+				return await getSpecificNLS(resourceUrlTemplate, languageId, thePreviousVersion);
+			} catch (err) {
+				if (/\[404\]/.test(err.message)) {
+					console.warn(`Language pack ${languageId}@${thePreviousVersion} is missing. Downloading previous version...`);
+					return await getSpecificNLS(resourceUrlTemplate, languageId, previousVersion(thePreviousVersion));
+				} else {
+					throw err;
+				}
+			}
 		} else {
 			throw err;
 		}
diff --git a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.document.test.ts b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.document.test.ts
index 1f34fc7998fc1..3a28ea9909fe2 100644
--- a/extensions/vscode-api-tests/src/singlefolder-tests/notebook.document.test.ts
+++ b/extensions/vscode-api-tests/src/singlefolder-tests/notebook.document.test.ts
@@ -423,7 +423,7 @@ suite('Notebook Document', function () {
 		assert.strictEqual(document.isDirty, false);
 	});
 
-	test('onDidOpenNotebookDocument - emit event only once when opened in two editors', async function () {
+	test.skip('onDidOpenNotebookDocument - emit event only once when opened in two editors', async function () { // TODO@rebornix https://github.com/microsoft/vscode/issues/157222
 		const uri = await utils.createRandomFile(undefined, undefined, '.nbdtest');
 		let counter = 0;
 		testDisposables.push(vscode.workspace.onDidOpenNotebookDocument(nb => {