-Fix issue 4416

See [issue 4987](https://github.com/diaspora/diaspora/issues/4987) and [4416](https://github.com/diaspora/diaspora/issues/4416)
I think I can give a try.