diff --git a/lib/common/mobile/android/android-emulator-services.ts b/lib/common/mobile/android/android-emulator-services.ts
index efe09016b6..8fd7cbb592 100644
--- a/lib/common/mobile/android/android-emulator-services.ts
+++ b/lib/common/mobile/android/android-emulator-services.ts
@@ -235,7 +235,7 @@ export class AndroidEmulatorServices
 		const minVersion = semver.coerce(AndroidVirtualDevice.MIN_ANDROID_VERSION);
 		const bestVersion = best && best.version && semver.coerce(best.version);
 
-		return bestVersion && semver.gte(bestVersion, minVersion) ? best : null;
+		return !bestVersion || semver.gte(bestVersion, minVersion) ? best : null;
 	}
 
 	private async waitForEmulatorBootToComplete(
diff --git a/lib/common/mobile/emulator-helper.ts b/lib/common/mobile/emulator-helper.ts
index f892b605fa..9e8434cba7 100644
--- a/lib/common/mobile/emulator-helper.ts
+++ b/lib/common/mobile/emulator-helper.ts
@@ -5,6 +5,7 @@ import { injector } from "../yok";
 export class EmulatorHelper implements Mobile.IEmulatorHelper {
 	// https://developer.android.com/guide/topics/manifest/uses-sdk-element
 	public mapAndroidApiLevelToVersion = {
+		"android-36": "16.0.0",
 		"android-35": "15.0.0",
 		"android-34": "14.0.0",
 		"android-33": "13.0.0",
diff --git a/packages/doctor/src/android-tools-info.ts b/packages/doctor/src/android-tools-info.ts
index 3950b56587..7c5dfb67e4 100644
--- a/packages/doctor/src/android-tools-info.ts
+++ b/packages/doctor/src/android-tools-info.ts
@@ -32,6 +32,7 @@ export class AndroidToolsInfo implements NativeScriptDoctor.IAndroidToolsInfo {
 			"android-33",
 			"android-34",
 			"android-35",
+			"android-36",
 		];
 
 		const isRuntimeVersionLessThan = (targetVersion: string) => {
diff --git a/packages/doctor/test/android-tools-info.ts b/packages/doctor/test/android-tools-info.ts
index afa3c5fcf7..90a24bb552 100644
--- a/packages/doctor/test/android-tools-info.ts
+++ b/packages/doctor/test/android-tools-info.ts
@@ -70,6 +70,7 @@ describe("androidToolsInfo", () => {
 						"android-33",
 						"android-34",
 						"android-35",
+						"android-36",
 					];
 				}
 			},