diff --git a/src/main/io/serial_cli.c b/src/main/io/serial_cli.c
index 63e4201bd..ac0eb0d07 100644
--- a/src/main/io/serial_cli.c
+++ b/src/main/io/serial_cli.c
@@ -2173,15 +2173,20 @@ static void cliSet(char *cmdline)
             cliPrint("\r\n");
         }
     } else if ((eqptr = strstr(cmdline, "=")) != NULL) {
-        // has equal, set var
+        // has equals
+
         char *lastNonSpaceCharacter = eqptr;
         while (*(lastNonSpaceCharacter - 1) == ' ') {
             lastNonSpaceCharacter--;
         }
         uint8_t variableNameLength = lastNonSpaceCharacter - cmdline;
 
+        // skip the '=' and any ' ' characters
         eqptr++;
-        len--;
+        while (*(eqptr) == ' ') {
+            eqptr++;
+        }
+
         for (i = 0; i < VALUE_COUNT; i++) {
             val = &valueTable[i];
             // ensure exact match when setting to prevent setting variables with shorter names