Refactoring how we're doing sessions to avoid the initial blinking.