diff --git a/HISTORY.rst b/HISTORY.rst
index a0e3f46f..3443639f 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -9,6 +9,7 @@ PlatformIO 4.0
 
 * Added Python 3.5+ support
   (`issue #895 <https://github.com/platformio/platformio-core/issues/895>`_)
+* Fixed an issue with slow updating of PlatformIO Core packages on Windows
 
 PlatformIO 3.0
 --------------
diff --git a/platformio/managers/core.py b/platformio/managers/core.py
index 06183901..3fd7f1cd 100644
--- a/platformio/managers/core.py
+++ b/platformio/managers/core.py
@@ -106,9 +106,10 @@ def update_core_packages(only_check=False, silent=False):
 
 def shutdown_piohome_servers():
     port = 8010
-    while port < 8100:
+    while port < 8050:
         try:
-            requests.get("http://127.0.0.1:%d?__shutdown__=1" % port)
+            requests.get(
+                "http://127.0.0.1:%d?__shutdown__=1" % port, timeout=0.01)
         except:  # pylint: disable=bare-except
             pass
         port += 1