diff --git a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
index f95344995..1b5c8c9fe 100644
--- a/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
+++ b/arduino-core/src/cc/arduino/packages/uploaders/SerialUploader.java
@@ -192,6 +192,9 @@ public class SerialUploader extends Uploader {
     if (finalUploadPort == null) {
       finalUploadPort = actualUploadPort;
     }
+    if (finalUploadPort == null) {
+      finalUploadPort = userSelectedUploadPort;
+    }
     BaseNoGui.selectSerialPort(finalUploadPort);
     return uploadResult;
   }