Only wait for sessions if enabled

Only wait for sessions if enabled