diff --git a/nanoFirmwareFlasher/Program.cs b/nanoFirmwareFlasher/Program.cs
index 296c74db..08571795 100644
--- a/nanoFirmwareFlasher/Program.cs
+++ b/nanoFirmwareFlasher/Program.cs
@@ -246,6 +246,7 @@ static async Task RunOptionsAndReturnExitCodeAsync(Options o)
                 // DFU related
                 else if (
                     o.ListDevicesInDfuMode ||
+                    o.DfuUpdate ||
                     !string.IsNullOrEmpty(o.DfuDeviceId))
                 {
                     o.Platform = "stm32";
diff --git a/nanoFirmwareFlasher/Stm32Operations.cs b/nanoFirmwareFlasher/Stm32Operations.cs
index 4e06290b..59f6b6fc 100644
--- a/nanoFirmwareFlasher/Stm32Operations.cs
+++ b/nanoFirmwareFlasher/Stm32Operations.cs
@@ -136,6 +136,7 @@ internal static async System.Threading.Tasks.Task<ExitCodes> UpdateFirmwareAsync
             if (updateInterface == Interface.Dfu)
             {
                 // DFU update
+                dfuDeviceId = dfuDeviceId == null ? connectedStDfuDevices[0].serial : dfuDeviceId;
                 dfuDevice = new StmDfuDevice(dfuDeviceId);
 
                 if (!dfuDevice.DevicePresent)