Queue MOH inherited when agent puts a caller back on hold

We use MOH to play announcements to the caller while they wait in the queue its timed so they can never hear the same announcement twice and played in an exact order this works fine till an agent answers a call and puts the caller on hold, then they hear the queue MOH so they are listening to the same announcements over again and worse the caller could be on hold with the agent for any amount of time.

Is there a way to set it so that when an agent puts a queue caller on hold the caller hears a different hold music, or ringing or anything but the queue MOH?