diff --git a/Tools/px_uploader.py b/Tools/px_uploader.py
index e0bcff2e70..af78be5e87 100755
--- a/Tools/px_uploader.py
+++ b/Tools/px_uploader.py
@@ -542,16 +542,14 @@ class uploader(object):
         self.port.close()
 
     def __next_baud_flightstack(self):
-        self.baudrate_flightstack_idx = self.baudrate_flightstack_idx + 1
-        if self.baudrate_flightstack_idx >= len(self.baudrate_flightstack):
+        if self.baudrate_flightstack_idx + 1 >= len(self.baudrate_flightstack):
             return False
-
         try:
-            self.port.baudrate = self.baudrate_flightstack[self.baudrate_flightstack_idx]
+            self.port.baudrate = self.baudrate_flightstack[self.baudrate_flightstack_idx + 1]
+            self.baudrate_flightstack_idx = self.baudrate_flightstack_idx + 1
         except serial.SerialException:
             # Sometimes _configure_port fails
             time.sleep(0.04)
-            pass
 
         return True