Add fallback for non-authenticated sessions