How to change clef in the middle of a score without having the clef on the previous bar?

I'm doing a jazz lead sheet (with treble clef) and at the end there's a coda for an ending with bass clef, so the bass clef is automatically put on the end of the previous bar (which is in the staff above the ending). This makes it very confusing to interpet, so I was wondering if there's a way to put the clef at the beggining of the staff as if it was the beggining of the score.