diff --git a/appd_ZeverSolarSensor.py b/appd_ZeverSolarSensor.py
index 3c06afd..bf2b956 100644
--- a/appd_ZeverSolarSensor.py
+++ b/appd_ZeverSolarSensor.py
@@ -82,7 +82,9 @@ def doGetGenAndSendAsSensor(self, arg):
         stateInfo1 = generationFormat.format(self.generatedPower)
         self.set_state("sensor.zeverSolar_generated_power", state=stateInfo1, attributes=\
                        {"unit_of_measurement": "kW", \
-                        "device_class": "power", \
+                        "last_reset" : "1970-01-01T00:00:00+00:00", \
+                        "state_class": "measurement", \
+                        "device_class": "energy", \
                         "icon": "mdi:white-balance-sunny", \
                         "friendly_name": "Generated Power",
                         "lastUpdated": lastUpdated
@@ -92,7 +94,9 @@ def doGetGenAndSendAsSensor(self, arg):
         stateInfo2 = generationFormat.format(self.totalEnergyDaily)
         self.set_state("sensor.zeverSolar_daily_energy", state=stateInfo2, attributes=\
                        {"unit_of_measurement": "kWh", \
-                        "device_class": "power", \
+                        "last_reset" : "1970-01-01T00:00:00+00:00", \
+                        "state_class": "measurement", \
+                        "device_class": "energy", \
                         "icon": "mdi:white-balance-sunny", \
                         "friendly_name": "Daily Generated Energy",
                         "lastUpdated": lastUpdated