Fix currently active session being "ended" after server session "end"