You mentioned you will send me the complete project repro, so I was waiting on it.
Your change seems safe enough, but not sure why you needed it, nor what was different between your setup and mine. As I showed in the screens, everything worked as expected on my end... so what was wrong is anyone's guess.