Sorry all, I was off sick for a couple of days. This should fix the problem:
https://github.com/discourse/discourse/pull/29775
I tried this locally with S3 uploads disabled and S3 backups enabled before and after the fix, I was able to replicate the same error and then resolve it.