Make type parameter optional. Getting an error on prod that is not happening locally