[BUGFIX] FollowUp to #56797 in I1f15fbd262036b6b2d0159cd0e9613ad7135a296