diff --git a/src/modules/ekf2/EKF/ekf.cpp b/src/modules/ekf2/EKF/ekf.cpp
index 82dc180dda..5b814667c5 100644
--- a/src/modules/ekf2/EKF/ekf.cpp
+++ b/src/modules/ekf2/EKF/ekf.cpp
@@ -240,10 +240,8 @@ void Ekf::predictState(const imuSample &imu_delayed)
 	// subtract component of angular rate due to earth rotation
 	corrected_delta_ang -= _R_to_earth.transpose() * _earth_rate_NED * imu_delayed.delta_ang_dt;
 
-	const Quatf dq(AxisAnglef{corrected_delta_ang});
-
 	// rotate the previous quaternion by the delta quaternion using a quaternion multiplication
-	_state.quat_nominal = (_state.quat_nominal * dq).normalized();
+	_state.quat_nominal = (_state.quat_nominal * Quatf::expq(corrected_delta_ang * 0.5f)).normalized();
 	_R_to_earth = Dcmf(_state.quat_nominal);
 
 	// Calculate an earth frame delta velocity
diff --git a/src/modules/ekf2/EKF/output_predictor.cpp b/src/modules/ekf2/EKF/output_predictor.cpp
index bdb8077ea0..c11bae377d 100644
--- a/src/modules/ekf2/EKF/output_predictor.cpp
+++ b/src/modules/ekf2/EKF/output_predictor.cpp
@@ -67,12 +67,12 @@ void OutputPredictor::alignOutputFilter(const Quatf &quat_state, const Vector3f
 
 	// loop through the output filter state history and add the deltas
 	for (uint8_t i = 0; i < _output_buffer.get_length(); i++) {
-		_output_buffer[i].quat_nominal = q_delta * _output_buffer[i].quat_nominal;
-		_output_buffer[i].quat_nominal.normalize();
 		_output_buffer[i].vel += vel_delta;
 		_output_buffer[i].pos += pos_delta;
 	}
 
+	resetQuaternion(q_delta);
+
 	_output_new = _output_buffer.get_newest();
 }
 
@@ -118,6 +118,7 @@ void OutputPredictor::resetQuaternion(const Quatf &quat_change)
 	// apply the change in attitude quaternion to our newest quaternion estimate
 	// which was already taken out from the output buffer
 	_output_new.quat_nominal = quat_change * _output_new.quat_nominal;
+	_output_new.quat_nominal.normalize();
 }
 
 void OutputPredictor::resetHorizontalVelocityTo(const Vector2f &delta_horz_vel)
@@ -187,13 +188,8 @@ void OutputPredictor::calculateOutputStates(const uint64_t time_us, const Vector
 	_output_new.time_us = time_us;
 	_output_vert_new.time_us = time_us;
 
-	const Quatf dq(AxisAnglef{delta_angle_corrected});
-
 	// rotate the previous INS quaternion by the delta quaternions
-	_output_new.quat_nominal = _output_new.quat_nominal * dq;
-
-	// the quaternions must always be normalised after modification
-	_output_new.quat_nominal.normalize();
+	_output_new.quat_nominal = (_output_new.quat_nominal * Quatf::expq(delta_angle_corrected * 0.5f)).normalized();
 
 	// calculate the rotation matrix from body to earth frame
 	_R_to_earth_now = Dcmf(_output_new.quat_nominal);