Fixed #6077 hanging null on delete entity tag