diff --git a/nanoFirmwareFlasher.Tool/Program.cs b/nanoFirmwareFlasher.Tool/Program.cs
index 6be3faa3..b4310504 100644
--- a/nanoFirmwareFlasher.Tool/Program.cs
+++ b/nanoFirmwareFlasher.Tool/Program.cs
@@ -449,8 +449,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
             {
                 // easiest one: ESP32
                 if (o.TargetName.StartsWith("ESP")
-                    || o.TargetName.StartsWith("M5")
-                    || o.TargetName.StartsWith("Pyb")
+                    || o.TargetName.StartsWith("M5")                    
                     || o.TargetName.StartsWith("FEATHER")
                     || o.TargetName.StartsWith("ESPKALUGA"))
                 {
@@ -464,6 +463,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
                     || o.TargetName.StartsWith("IngenuityMicro")
                     || o.TargetName.StartsWith("WeAct")
                     || o.TargetName.StartsWith("ORGPAL")
+                    || o.TargetName.StartsWith("Pyb")
                 )
                 {
                     // candidates for STM32
@@ -509,17 +509,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
                     !string.IsNullOrEmpty(o.DfuDeviceId))
                 {
                     o.Platform = SupportedPlatform.stm32;
-                }
-                // ESP32 related
-                else if (
-                    !string.IsNullOrEmpty(o.SerialPort) ||
-                    (o.BaudRate != 921600) ||
-                    (o.Esp32FlashMode != "dio") ||
-                    (o.Esp32FlashFrequency != 40) ||
-                    !string.IsNullOrEmpty(o.Esp32ClrFile))
-                {
-                    o.Platform = SupportedPlatform.esp32;
-                }
+                }                
                 // GG11 related
                 else if (o.ListJLinkDevices)
                 {
@@ -536,6 +526,16 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
                 {
                     o.Platform = SupportedPlatform.stm32;
                 }
+                // ESP32 related
+                else if (
+                    !string.IsNullOrEmpty(o.SerialPort) ||
+                    (o.BaudRate != 921600) ||
+                    (o.Esp32FlashMode != "dio") ||
+                    (o.Esp32FlashFrequency != 40) ||
+                    !string.IsNullOrEmpty(o.Esp32ClrFile))
+                {
+                    o.Platform = SupportedPlatform.esp32;
+                }
             }
 
             #endregion