diff --git a/src/modules/micrortps_bridge/micrortps_client/microRTPS_client_main.cpp b/src/modules/micrortps_bridge/micrortps_client/microRTPS_client_main.cpp
index 0a8d6b3cb8..179dbb97bb 100644
--- a/src/modules/micrortps_bridge/micrortps_client/microRTPS_client_main.cpp
+++ b/src/modules/micrortps_bridge/micrortps_client/microRTPS_client_main.cpp
@@ -96,22 +96,22 @@ static int parse_options(int argc, char *argv[])
 
 		case 'w': _options.sleep_ms        = strtoul(myoptarg, nullptr, 10);    break;
 
-		case 'b':
-		{
-			int baudrate = 0;
-			if (px4_get_parameter_value(myoptarg, baudrate) != 0) {
-				PX4_ERR("baudrate parsing failed");
+		case 'b': {
+				int baudrate = 0;
+
+				if (px4_get_parameter_value(myoptarg, baudrate) != 0) {
+					PX4_ERR("baudrate parsing failed");
+				}
+
+				if (baudrate < 9600 || baudrate > 3000000) {
+					PX4_ERR("invalid baud rate '%s'", myoptarg);
+				}
+
+				_options.baudrate = baudrate;
+
+				break;
 			}
 
-			if (baudrate < 9600 || baudrate > 3000000) {
-				PX4_ERR("invalid baud rate '%s'", myoptarg);
-			}
-
-			_options.baudrate = baudrate;
-
-			break;
-		}
-
 		case 'r': _options.recv_port       = strtoul(myoptarg, nullptr, 10);    break;
 
 		case 's': _options.send_port       = strtoul(myoptarg, nullptr, 10);    break;