Fixed edge cases with messageShouldRefreshStream