Fix NPlusOneQuery call even if disabled