Fixed an issue where disconnecting caused issues with send reinstanciating the connection
Merge branch 'hotfix/3561' into develop

Close #3561