diff --git a/src/main/main.c b/src/main/main.c
index 56b670076b..6be46d2cd2 100755
--- a/src/main/main.c
+++ b/src/main/main.c
@@ -287,8 +287,9 @@ void init(void)
         pwm_params.airplane = true;
     else
         pwm_params.airplane = false;
-
+#ifdef STM32F10X
     pwm_params.useUART2 = doesConfigurationUsePort(SERIAL_PORT_USART2);
+#endif
     pwm_params.useVbat = feature(FEATURE_VBAT);
     pwm_params.useSoftSerial = feature(FEATURE_SOFTSERIAL);
     pwm_params.useParallelPWM = feature(FEATURE_RX_PARALLEL_PWM);
diff --git a/src/main/target/MASSIVEF3/target.h b/src/main/target/MASSIVEF3/target.h
index 3cf4c3cece..066af300b0 100644
--- a/src/main/target/MASSIVEF3/target.h
+++ b/src/main/target/MASSIVEF3/target.h
@@ -17,6 +17,8 @@
 
 #pragma once
 
+#define TARGET_BOARD_IDENTIFIER "MASSIVEF3"
+
 #define LED0_GPIO   GPIOE
 #define LED0_PIN    Pin_8|Pin_12 // Blue LEDs - PE8/PE12
 #define LED0_PERIPHERAL RCC_AHBPeriph_GPIOE
diff --git a/src/main/telemetry/hott.c b/src/main/telemetry/hott.c
index 0f37c84d02..b20f10a8a6 100644
--- a/src/main/telemetry/hott.c
+++ b/src/main/telemetry/hott.c
@@ -270,10 +270,16 @@ void configureHoTTTelemetryPort(void)
         // FIXME only need to do this if the port is shared
         previousPortMode = hottPort->mode;
         previousBaudRate = hottPort->baudRate;
-
-        if (hottPort->identifier == SERIAL_PORT_SOFTSERIAL1 || hottPort->identifier == SERIAL_PORT_SOFTSERIAL2) {
+#ifdef USE_SOFTSERIAL1
+        if (hottPort->identifier == SERIAL_PORT_SOFTSERIAL1) {
             useSoftserialRxFailureWorkaround = true;
         }
+#endif
+#ifdef USE_SOFTSERIAL2
+        if (hottPort->identifier == SERIAL_PORT_SOFTSERIAL2) {
+            useSoftserialRxFailureWorkaround = true;
+        }
+#endif
     }
 }