Add stop listening behavior when re-rendering indicatorSelector