Fix noop listener based on feedback