[#527] Avoid extra requests

This calls produce the same request twice on Firefox