Move fallback from logistics to server