diff --git a/HISTORY.rst b/HISTORY.rst
index 76faa95bf3..e2e7c71f08 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -17,6 +17,7 @@ PlatformIO Core 6
 ~~~~~~~~~~~~~~~~~~
 
 * Show "TimeoutError" only in the verbose mode when can not find a serial port
+* Fixed an issue when a serial port was not automatically detected if the board has predefined HWIDs
 
 6.1.0 (2022-07-06)
 ~~~~~~~~~~~~~~~~~~
diff --git a/platformio/device/finder.py b/platformio/device/finder.py
index f4c29cab12..0d7eba903c 100644
--- a/platformio/device/finder.py
+++ b/platformio/device/finder.py
@@ -97,9 +97,11 @@ def find_serial_port(  # pylint: disable=too-many-arguments
 
     if upload_protocol and upload_protocol.startswith("blackmagic"):
         return find_blackmagic_serial_port(prefer_gdb_port, timeout)
+    port = None
     if board_config and board_config.get("build.hwids", []):
-        return find_board_serial_port(board_config, timeout, verbose)
-    port = find_known_uart_port(ensure_ready, timeout, verbose)
+        port = find_board_serial_port(board_config, timeout, verbose)
+    if not port:
+        port = find_known_uart_port(ensure_ready, timeout, verbose)
     if port:
         return port