diff --git a/Detectors/GlobalTracking/src/MatchGlobalFwd.cxx b/Detectors/GlobalTracking/src/MatchGlobalFwd.cxx
index 7ed50ce7400ae..21ddaa2a4f794 100644
--- a/Detectors/GlobalTracking/src/MatchGlobalFwd.cxx
+++ b/Detectors/GlobalTracking/src/MatchGlobalFwd.cxx
@@ -10,6 +10,7 @@
 // or submit itself to any jurisdiction.
 
 #include "GlobalTracking/MatchGlobalFwd.h"
+#include "MathUtils/Utils.h"
 #include <queue>
 
 using namespace o2::globaltracking;
@@ -889,6 +890,19 @@ o2::mch::TrackParam MatchGlobalFwd::FwdtoMCH(const o2::dataformats::GlobalFwdTra
   return o2::mch::TrackParam(convertedTrack);
 }
 
+/// Constrains angle to be within the [-pi, pi] range.
+/// \note Inspired by TVector2::Phi_mpi_pi in ROOT.
+/// \param angle  angle
+/// \return value of angle within [-pi, pi].
+static double constrainAngle(double angle)
+{
+  while (angle >= o2::constants::math::PI)
+    angle -= o2::constants::math::TwoPI;
+  while (angle < -o2::constants::math::PI)
+    angle += o2::constants::math::TwoPI;
+  return angle;
+}
+
 //_________________________________________________________________________________________________
 MatchGlobalFwd::MatchGlobalFwd()
 {
@@ -926,6 +940,9 @@ MatchGlobalFwd::MatchGlobalFwd()
     // Update Parameters
     r_k_kminus1 = m_k - H_k * GlobalMuonTrackParameters; // Residuals of prediction
 
+    // Restrict the phi residual to the [-pi, pi] range
+    o2::math_utils::bringToPMPiGend(r_k_kminus1[2]);
+
     auto matchChi2Track = ROOT::Math::Similarity(r_k_kminus1, invResCov);
 
     return matchChi2Track;
@@ -963,6 +980,9 @@ MatchGlobalFwd::MatchGlobalFwd()
   // Residuals of prediction
   r_k_kminus1 = m_k - H_k * GlobalMuonTrackParameters;
 
+  // Restrict the phi residual to the [-pi, pi] range
+  o2::math_utils::bringToPMPiGend(r_k_kminus1[2]);
+
   auto matchChi2Track = ROOT::Math::Similarity(r_k_kminus1, invResCov);
 
   return matchChi2Track; };