Server select fix

Thomrequested to merge
(removed):server-select-fix into stable-3.1

Fixes #4725 (closed) (was merged to master, needed a new MR to merge to stable-3.1)

Merge request reports