Fix server fallback