diff --git a/radio/src/cli.cpp b/radio/src/cli.cpp
index 7f8972756..a33e0c8d6 100644
--- a/radio/src/cli.cpp
+++ b/radio/src/cli.cpp
@@ -712,6 +712,8 @@ int cliShowJitter(const char ** argv)
 int cliGps(const char ** argv)
 {
   int baudrate = 0;
+  
+#if defined(DEBUG)
   if (argv[1][0] == '$') {
     // send command to GPS
     gpsSendFrame(argv[1]);
@@ -719,8 +721,10 @@ int cliGps(const char ** argv)
   else if (!strcmp(argv[1], "trace")) {
     gpsTraceEnabled = !gpsTraceEnabled;
   }
-
-  else if (toInt(argv, 1, &baudrate) > 0 && baudrate > 0) {
+  else
+#endif
+  
+  if (toInt(argv, 1, &baudrate) > 0 && baudrate > 0) {
     gpsInit(baudrate);
     serialPrint("GPS baudrate set to %d", baudrate);
   }