Preserve handler creation only on new event stream