Better deal with organisation loading state