diff --git a/modules/utils/supportsHistory.js b/modules/utils/supportsHistory.js
index 582f471f74..7293be7b8e 100644
--- a/modules/utils/supportsHistory.js
+++ b/modules/utils/supportsHistory.js
@@ -2,12 +2,14 @@ function supportsHistory() {
   /*! taken from modernizr
    * https://github.com/Modernizr/Modernizr/blob/master/LICENSE
    * https://github.com/Modernizr/Modernizr/blob/master/feature-detects/history.js
+   * changed to avoid false negatives for Windows Phones: https://github.com/rackt/react-router/issues/586
    */
   var ua = navigator.userAgent;
   if ((ua.indexOf('Android 2.') !== -1 ||
       (ua.indexOf('Android 4.0') !== -1)) &&
       ua.indexOf('Mobile Safari') !== -1 &&
-      ua.indexOf('Chrome') === -1) {
+      ua.indexOf('Chrome') === -1 &&
+      ua.indexOf('Windows Phone') === -1) {
     return false;
   }
   return (window.history && 'pushState' in window.history);