Trigger action if switch on same state

Hi all,
I Have setup some commands with Amazon dot, like RF light switch and TV. When light (for example) is turned on from the switch or remote control (not from HA), HA does not change the state to ON as expected. Next when I want to turn off the light from Alexa, RF signal is not send. I have to change state from HA, send Alexa commands for on and then off or manual turn off.
It will be nice to have option to enable to trigger the action if switch is on same state.