Try the following steps to avoid the glitch.

Do not change costumes during intermission sequences.
Do not change into a costume you obtained from a Holocron until you reach the next save point.
Do not use Kento's Robes until you have completed the game on that file. Those robes increase the odds of the glitch happening.
Never change costumes during the Death Star level.