Integrating Smart Plug Sensors into Energy Dashboard

Hello everyone, I’m currently working on integrating my Sonoff S31 smart plug, running Tasmota, into Home Assistant (HA) using the MQTT integration. The setup was straightforward as it auto-discovered without needing YAML configuration. However, I’ve encountered an issue where the energy sensors (Total energy and Daily energy) aren’t showing up in the energy dashboard. I suspect this is because their device_class isn’t set to ‘energy’. I’ve tried modifying this without success. Additionally, I attempted using the Riemann sum integral sensor to integrate the plug’s Power sensor, but that approach also didn’t work. It correctly reports kWh, but I still can’t add it to the dashboard. Does anyone have a solution for this? Any insights or workarounds would be greatly appreciated!