Prevent infinity loop bug, closes #244

This closes #244. I've also tested this fix manually on our dev server with a copy of `splash` running locally to confirm full integration success.