diff --git a/src/main/fc/cli.c b/src/main/fc/cli.c
index 9a5d27d284..b7d7e4e977 100755
--- a/src/main/fc/cli.c
+++ b/src/main/fc/cli.c
@@ -1747,7 +1747,7 @@ static void cliSerial(char *cmdline)
 
         switch(i) {
             case 0:
-                if (baudRateIndex < BAUD_9600 || baudRateIndex > BAUD_115200) {
+                if (baudRateIndex < BAUD_1200 || baudRateIndex > BAUD_115200) {
                     continue;
                 }
                 portConfig.msp_baudrateIndex = baudRateIndex;
diff --git a/src/main/telemetry/ltm.c b/src/main/telemetry/ltm.c
index a360c9525b..998b64358a 100644
--- a/src/main/telemetry/ltm.c
+++ b/src/main/telemetry/ltm.c
@@ -437,6 +437,12 @@ void configureLtmTelemetryPort(void)
     else
         ltm_schedule = ltm_normal_schedule;
 
+    /* Sanity check that we can support the scheduler */
+    if(baudRateIndex == BAUD_2400 && telemetryConfig()->ltmUpdateRate == LTM_RATE_NORMAL)
+         ltm_schedule = ltm_medium_schedule;
+    if(baudRateIndex == BAUD_1200)
+         ltm_schedule = ltm_slow_schedule;
+
     ltmPort = openSerialPort(portConfig->identifier, FUNCTION_TELEMETRY_LTM, NULL, baudRates[baudRateIndex], TELEMETRY_LTM_INITIAL_PORT_MODE, SERIAL_NOT_INVERTED);
     if (!ltmPort)
         return;