diff --git a/packages/create-react-app/createReactApp.js b/packages/create-react-app/createReactApp.js
index 5d837c60..a62f8858 100755
--- a/packages/create-react-app/createReactApp.js
+++ b/packages/create-react-app/createReactApp.js
@@ -594,7 +594,11 @@ function checkYarnVersion() {
     yarnVersion = execSync('yarnpkg --version')
       .toString()
       .trim();
-    hasMinYarnPnp = semver.gte(yarnVersion, '1.12.0');
+    let trimmedYarnVersion = /^(.+?)[-+].+$/.exec(yarnVersion);
+    if (trimmedYarnVersion) {
+      trimmedYarnVersion = trimmedYarnVersion.pop();
+    }
+    hasMinYarnPnp = semver.gte(trimmedYarnVersion || yarnVersion, '1.12.0');
   } catch (err) {
     // ignore
   }