Remove hijack from api when not necessary