A two-step roller finger follower having a movable high-lift portion and a low-lift portion. A lock pin mechanism in the low-lift portion includes a lock pin that may be driven hydraulically into latched engagement with the high-lift portion. The lock pin assembly comprises a lock pin and a separable switching pin. A blocking clip mountable on the associated hydraulic lash adjuster includes first and second ends that extend into a switching pin locking groove to block axial motion thereof. A ramp on the follower body mates with a ramp on the blocking clip such that oscillatory motion of the follower engages and disengages the blocking pin from the locking groove. The clip unblocks the switching pin at only those times in the camshaft rotational cycle when complete locking and unlocking is assured, and ending well before the beginning of the next valve lift event.