Board Thread:Suggestions forum/@comment-26983553-20151012160422/@comment-29106566-20151012161656

You can disable them teleporting to you in the unit properties.