diff --git a/lib/controllers/run-controller.ts b/lib/controllers/run-controller.ts
index ae88eea96d..064cb2f592 100644
--- a/lib/controllers/run-controller.ts
+++ b/lib/controllers/run-controller.ts
@@ -186,7 +186,7 @@ export class RunController implements IRunController {
 			const deviceDescriptor = _.find(deviceDescriptors, dd => dd.identifier === device.deviceInfo.identifier);
 			const platformData = this.$platformsDataService.getPlatformData(device.deviceInfo.platform, projectData);
 			const prepareData = this.$prepareDataService.getPrepareData(liveSyncInfo.projectDir, device.deviceInfo.platform, { ...liveSyncInfo, watch: !liveSyncInfo.skipWatcher, nativePrepare: { skipNativePrepare: !!deviceDescriptor.skipNativePrepare } });
-			const buildData = this.$buildDataService.getBuildData(projectData.projectDir, device.deviceInfo.platform, { ...liveSyncInfo, outputPath: deviceDescriptor.outputPath });
+			const buildData = this.$buildDataService.getBuildData(projectData.projectDir, device.deviceInfo.platform, { ...liveSyncInfo, outputPath: deviceDescriptor.outputPath, buildForDevice: !device.isEmulator });
 			const prepareResultData = await this.$prepareController.prepare(prepareData);
 
 			try {
diff --git a/lib/services/build-info-file-service.ts b/lib/services/build-info-file-service.ts
index 707caaaffe..abb8e5fd34 100644
--- a/lib/services/build-info-file-service.ts
+++ b/lib/services/build-info-file-service.ts
@@ -50,7 +50,7 @@ export class BuildInfoFileService implements IBuildInfoFileService {
 
 	public async saveDeviceBuildInfo(device: Mobile.IDevice, projectData: IProjectData, outputFilePath: string): Promise<void> {
 		const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);
-		const appIdentifier = projectData.projectIdentifiers[device.deviceInfo.platform];
+		const appIdentifier = projectData.projectIdentifiers[device.deviceInfo.platform.toLowerCase()];
 
 		await device.fileSystem.putFile(path.join(outputFilePath, buildInfoFileName), deviceFilePath, appIdentifier);
 	}