Fix for emergency sessions (no firm)