diff --git a/HISTORY.rst b/HISTORY.rst
index e463857e..566842af 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -15,6 +15,7 @@ PlatformIO Core 5
 - Improved checking of available Internet connection for IPv6-only workstations (`pull #4151 <https://github.com/platformio/platformio-core/pull/4151>`_)
 - Better detecting of default PlatformIO project directory on Linux OS (`pull #4158 <https://github.com/platformio/platformio-core/pull/4158>`_)
 - Respect disabling debugging server from "platformio.ini" passing an empty value to the `debug_server <https://docs.platformio.org/en/latest/projectconf/section_env_debug.html#debug-server>`__ option
+- Fixed a "module 'asyncio' has no attribute 'run'" error when launching PIO Home using Python 3.6 (`issue #4169 <https://github.com/platformio/platformio-core/issues/4169>`_)
 
 5.2.4 (2021-12-15)
 ~~~~~~~~~~~~~~~~~~
diff --git a/setup.py b/setup.py
index 1b1cb8f8..6b645300 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
 from setuptools import find_packages, setup
 
 from platformio import (
@@ -45,7 +46,7 @@ home_requirements = [
     "aiofiles==0.8.*",
     "ajsonrpc==1.*",
     "starlette==0.18.*",
-    "uvicorn==0.17.*",
+    "uvicorn==%s" % ("0.17.*" if sys.version_info >= (3, 7) else "0.16.0"),
     "wsproto==1.0.*",
 ]