diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index 63b6a3427b2b6..cbe405cb52d7c 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -102,7 +102,7 @@ jobs:
         artifact: '$(ArtifactName)'
 
       - publish: $(System.DefaultWorkingDirectory)
-        condition: failed()
+        condition: and(eq(variables['CaptureRepositoryOnFailure'], 'true'), failed())
         displayName: 'Capture repo state for analysis'
         artifact: repository