diff --git a/firmware/common/rf_path.c b/firmware/common/rf_path.c
index 30fc9809..6f1af434 100644
--- a/firmware/common/rf_path.c
+++ b/firmware/common/rf_path.c
@@ -339,7 +339,10 @@ void rf_path_init(rf_path_t* const rf_path)
 	max2837_setup(&max2837);
 	max2837_start(&max2837);
 
+	// On HackRF One, the mixer is now set up earlier in boot.
+#ifndef HACKRF_ONE
 	mixer_setup(&mixer);
+#endif
 	switchctrl_set(rf_path, switchctrl);
 }
 
diff --git a/firmware/hackrf_usb/hackrf_usb.c b/firmware/hackrf_usb/hackrf_usb.c
index c9bf9700..38138f2c 100644
--- a/firmware/hackrf_usb/hackrf_usb.c
+++ b/firmware/hackrf_usb/hackrf_usb.c
@@ -229,6 +229,11 @@ int main(void)
 	detect_hardware_platform();
 	pin_setup();
 	enable_1v8_power();
+#ifdef HACKRF_ONE
+	// Set up mixer before enabling RF power, because its
+	// GPO is used to control the antenna bias tee.
+	mixer_setup(&mixer);
+#endif
 #if (defined HACKRF_ONE || defined RAD1O)
 	enable_rf_power();
 #endif