diff --git a/src/mainboard/google/bluey/mainboard.c b/src/mainboard/google/bluey/mainboard.c
index f4f076ef2e..93a3681d5d 100644
--- a/src/mainboard/google/bluey/mainboard.c
+++ b/src/mainboard/google/bluey/mainboard.c
@@ -218,6 +218,10 @@ static void mainboard_init(struct device *dev)
 	/* ADSP I2C (Charger/Fuel gauge) */
 	qupv3_se_fw_load_and_init(QUPV3_2_SE4, SE_PROTOCOL_I2C, MIXED);
 
+	gpi_firmware_load(QUP_0_GSI_BASE);
+	gpi_firmware_load(QUP_1_GSI_BASE);
+	gpi_firmware_load(QUP_2_GSI_BASE);
+
 	configure_parallel_charging_late();
 
 	/* Skip mainboard initialization if boot mode is "low-battery" or "off-mode charging" */
@@ -226,10 +230,6 @@ static void mainboard_init(struct device *dev)
 		halt();
 	}
 
-	gpi_firmware_load(QUP_0_GSI_BASE);
-	gpi_firmware_load(QUP_1_GSI_BASE);
-	gpi_firmware_load(QUP_2_GSI_BASE);
-
 	/*
 	 * Load console UART QUP firmware.
 	 * This is required even if coreboot's serial output is disabled.