diff --git a/firmware/common/hackrf_core.c b/firmware/common/hackrf_core.c
index 545b57e5..cb84daac 100644
--- a/firmware/common/hackrf_core.c
+++ b/firmware/common/hackrf_core.c
@@ -912,12 +912,12 @@ void pin_setup(void) {
 	gpio_output(&gpio_1v8_enable);
 
 #ifdef HACKRF_ONE
-	/* Configure RF power supply (VAA) switch control signal as output */
-	gpio_output(&gpio_vaa_disable);
-
 	/* Safe state: start with VAA turned off: */
 	disable_rf_power();
 
+	/* Configure RF power supply (VAA) switch control signal as output */
+	gpio_output(&gpio_vaa_disable);
+
 	scu_pinmux(SCU_PINMUX_GPIO3_10, SCU_GPIO_PDN | SCU_CONF_FUNCTION0);
 	scu_pinmux(SCU_PINMUX_GPIO3_11, SCU_GPIO_PDN | SCU_CONF_FUNCTION0);