OFFLINE devices (lightbulbs) in Z2M shows up as ON in home assistannt

[mihaiaka]

Hello everybody,

I've recently migrated from a LIDL ZigBee gateway to a Sonoff-P. I've ignored ZHA and configured Z2M.
With the Lidl gateway, when I was turning off the Lidl lightbulbs (HG07834C or Hue) from the wall switch (killing the power) the device would turn to "unavailable" in HA.
On Z2M, with the "Availability" feature set to 1 min, when I turn off the lights from the wall switch, they turn to "Offline", but on HA they are left ON/percentage/etc. I tried "retain": false on the lightbulbs (didn't help)

Is there any way to update/link the actual status on HA? Please see the below picture...