I got the same problem with retaliation and Gawin.
Always triggers combat mode after TP.

Please fix.