diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1d517795f434c..986e966a16a2d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -560,7 +560,7 @@ jobs:
             nvm install 18.0.0
             nvm alias default 18.0.0
             nvm use 18.0.0
-            choco install yarn
+            choco install yarn -y
       - run:
           name: Rebuild packages for windows
           command: |
diff --git a/packages/gatsby-source-wordpress/src/steps/create-schema-customization/helpers.js b/packages/gatsby-source-wordpress/src/steps/create-schema-customization/helpers.js
index 940866b3e11fc..5a914ba086755 100644
--- a/packages/gatsby-source-wordpress/src/steps/create-schema-customization/helpers.js
+++ b/packages/gatsby-source-wordpress/src/steps/create-schema-customization/helpers.js
@@ -336,10 +336,8 @@ function mergeDuplicateTypesAndReturnDedupedList(typeDefs) {
  * This is to catch and add helpful error messages for when an inconsistent schema between builds is inadvertently created due to some bug
  */
 export async function diffBuiltTypeDefs(typeDefs) {
-  if (
-    process.env.NODE_ENV !== `development` &&
-    process.env.WP_DIFF_SCHEMA_CUSTOMIZATION !== `true`
-  ) {
+  // only diff the schema if the user has opted in
+  if (process.env.WP_DIFF_SCHEMA_CUSTOMIZATION !== `true`) {
     return
   }