Should check if V2 gateway is disabled