Added early return for default server