diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
index 0708be35..df60515e 100644
--- a/MainWindow.xaml.cs
+++ b/MainWindow.xaml.cs
@@ -483,7 +483,12 @@ namespace DICUI
                 return;
             }
 
-            cmb_DriveSpeed.SelectedValue = speed;
+            // If the value is in the list, we can set it immediately
+            if (_driveSpeeds.Contains(speed))
+                cmb_DriveSpeed.SelectedValue = speed;
+            // Otherwise, we need to set the next lowest value
+            else
+                cmb_DriveSpeed.SelectedValue = _driveSpeeds.Where(s => s < speed).Last();
         }
 
         /// <summary>