[DEV-213] Fix connection regression