Changed the max timeout to always be the max poll interval

- This will help for when we have faster polling but a higher load on the server