diff --git a/conf_general.c b/conf_general.c
index 5774eb1c..973a88f2 100644
--- a/conf_general.c
+++ b/conf_general.c
@@ -1656,6 +1656,12 @@ int conf_general_detect_apply_all_foc(float max_power_loss,
 	int faultM1 = FAULT_CODE_NONE;
 	int faultM2 = FAULT_CODE_NONE;
 
+	// Measure DC offsets
+	// Needs to be done before getting the motor configuration
+	if(mcpwm_foc_dc_cal(false) == -1) {
+		return mc_interface_get_fault() - 100; // Offset fault by -100
+	}
+
 	int motor_last = mc_interface_get_motor_thread();
 	mc_interface_select_motor_thread(1);