Unfortunately I can't find a way to reproduce the stuck id issue locally, so we'll need to test run this on dev