diff --git a/README.md b/README.md
index 992809c94..4fc02297e 100644
--- a/README.md
+++ b/README.md
@@ -50,6 +50,8 @@ yarn
 yarn start
 ```
 
+NOTE: If you're on Windows, you need to use Yarn 1.5.1 until [this issue](https://github.com/yarnpkg/yarn/issues/6048) is resolved.
+
 ## Building the desktop app
 
 ```
diff --git a/scripts/yarn-install.js b/scripts/yarn-install.js
index 03a6989e1..89f304107 100644
--- a/scripts/yarn-install.js
+++ b/scripts/yarn-install.js
@@ -9,8 +9,9 @@ const glob = require('glob');
 const path = require('path');
 const {spawn} = require('child_process');
 const PACKAGES = ['static', 'src/plugins/*', 'src/fb/plugins/*'];
+const WINDOWS = /^win/.test(process.platform);
 const YARN_PATH =
-  process.argv.length > 2 ? path.join(__dirname, process.argv[2]) : 'yarn';
+  process.argv.length > 2 ? path.join(__dirname, process.argv[2]) : 'yarn' + (WINDOWS ? '.cmd' : '');
 
 Promise.all(
   PACKAGES.map(