Fix flickering issue when switching to different feeds