If you're already using React-Router a nice solution might be to infer all of the valid paths from the React-Router config and push valid pages for those paths to gh-pages. Would involve an unusual build step, but would get you valid 404 responses and avoid the redirect.