How to recover from an awkward wave