Just did this and it worked properly all the way through upon trying it a second time –
The first time it bugged where Zott would stay in one spot underwater before rescuing Elli.
Not sure if I should note that I was in my girlfriend’s personal story and not my own (although we follow the same storyline so I progressed to and from this one at the same time whilst doing it with her).