diff --git a/Common/Core/TrackSelection.h b/Common/Core/TrackSelection.h
index 5f937dd1880..4c86cb3c0fd 100644
--- a/Common/Core/TrackSelection.h
+++ b/Common/Core/TrackSelection.h
@@ -62,8 +62,8 @@ class TrackSelection
         (track.itsNCls() >= mMinNClustersITS) &&
         (track.itsChi2NCl() <= mMaxChi2PerClusterITS) &&
         (track.tpcChi2NCl() <= mMaxChi2PerClusterTPC) &&
-        ((isRun2 && mRequireITSRefit) ? (track.flags() & o2::aod::track::ITSrefit) : true) &&
-        ((isRun2 && mRequireTPCRefit) ? (track.flags() & o2::aod::track::TPCrefit) : true) &&
+        (mRequireITSRefit ? (isRun2 ? (track.flags() & o2::aod::track::ITSrefit) : track.hasITS()) : true) &&
+        (mRequireTPCRefit ? (isRun2 ? (track.flags() & o2::aod::track::TPCrefit) : track.hasTPC()) : true) &&
         ((isRun2 && mRequireGoldenChi2) ? (track.flags() & o2::aod::track::GoldenChi2) : true) &&
         FulfillsITSHitRequirements(track.itsClusterMap()) &&
         abs(track.dcaXY()) <= ((mMaxDcaXYPtDep) ? mMaxDcaXYPtDep(track.pt()) : mMaxDcaXY) &&