[SJS-56]: Attempted fix to XHR polling issue