diff --git a/build/darwin/sign.js b/build/darwin/sign.js
index 67656380dd5..6bf6eb23e2b 100644
--- a/build/darwin/sign.js
+++ b/build/darwin/sign.js
@@ -110,11 +110,11 @@ async function main(buildDir) {
 if (require.main === module) {
     main(process.argv[2]).catch(async (err) => {
         console.error(err);
-        const identities = await (0, cross_spawn_promise_1.spawn)('security', ['find-identity', '-p', 'codesigning', '-v']);
-        console.error(`Available identities:\n${identities}`);
         const tempDir = process.env['AGENT_TEMPDIRECTORY'];
         if (tempDir) {
             const keychain = path_1.default.join(tempDir, 'buildagent.keychain');
+            const identities = await (0, cross_spawn_promise_1.spawn)('security', ['find-identity', '-p', 'codesigning', '-v', keychain]);
+            console.error(`Available identities:\n${identities}`);
             const dump = await (0, cross_spawn_promise_1.spawn)('security', ['dump-keychain', keychain]);
             console.error(`Keychain dump:\n${dump}`);
         }
diff --git a/build/darwin/sign.ts b/build/darwin/sign.ts
index 74772d991bd..9f23660b289 100644
--- a/build/darwin/sign.ts
+++ b/build/darwin/sign.ts
@@ -120,11 +120,11 @@ async function main(buildDir?: string): Promise<void> {
 if (require.main === module) {
 	main(process.argv[2]).catch(async err => {
 		console.error(err);
-		const identities = await spawn('security', ['find-identity', '-p', 'codesigning', '-v']);
-		console.error(`Available identities:\n${identities}`);
 		const tempDir = process.env['AGENT_TEMPDIRECTORY'];
 		if (tempDir) {
 			const keychain = path.join(tempDir, 'buildagent.keychain');
+			const identities = await spawn('security', ['find-identity', '-p', 'codesigning', '-v', keychain]);
+			console.error(`Available identities:\n${identities}`);
 			const dump = await spawn('security', ['dump-keychain', keychain]);
 			console.error(`Keychain dump:\n${dump}`);
 		}