MySensors swapping identies

Hi,
I have a MySensors network integrated with HA (latest version) and I have a power meter measuring watts and kWh. This get two entities in HA

sensor.energy_meter_7_1
sensor.energy_meter_7_1_2

One is used for watts and the other for kWh. But fairly often these are swapping.

E.g.
Day 1
sensor.energy_meter_7_1 => Watts
sensor.energy_meter_7_1_2 => kWh

Day N
sensor.energy_meter_7_1 => kWh
sensor.energy_meter_7_1_2 => Watts

Which makes it very difficult to have automation rules.

My config:

mysensors:
  gateways:
    - device: '192.168.1.11'
      persistence_file: './mysensors.json'
      tcp_port: 5003
  optimistic: false
  persistence: true
  retain: true
  version: 2.3

Any idea on how to stabilize this?

Reported an issue https://github.com/home-assistant/core/issues/39110