A better handling will be implemented in NC 11 (https://github.com/nextcloud/server/issues/1118#issuecomment-243085757) which is currently available as beta version to test:
Two reasons why you should test Nextcloud 11 Beta this weekend!
Can someone test and report if there is still an issue with that. If yes, please open a bug report on github.com/nextcloud/server/issues