diff --git a/src/driver/drv_main.c b/src/driver/drv_main.c
index 27a3b3d43..fb2d3bfc3 100644
--- a/src/driver/drv_main.c
+++ b/src/driver/drv_main.c
@@ -41,7 +41,7 @@ const char* counter_mqttNames[OBK_NUM_COUNTERS] = {
 const char* counter_devClasses[OBK_NUM_COUNTERS] = {
 	"energy",
 	"energy",
-	"None"
+	""
 };
 
 typedef struct driver_s {
diff --git a/src/httpserver/hass.c b/src/httpserver/hass.c
index e7c5e7729..94c196736 100644
--- a/src/httpserver/hass.c
+++ b/src/httpserver/hass.c
@@ -255,9 +255,8 @@ HassDeviceInfo* hass_init_sensor_device_info(int index) {
 	if ((index >= OBK_CONSUMPTION_TOTAL) && (index <= OBK_CONSUMPTION_STATS))
 	{
 		const char* device_class_value = counter_devClasses[index - OBK_CONSUMPTION_TOTAL];
-		cJSON_AddStringToObject(info->root, "dev_cla", device_class_value);  //device_class=consumption
-
-		if (strcmp(device_class_value, "None")) {
+		if (strlen(device_class_value) > 0) {
+			cJSON_AddStringToObject(info->root, "dev_cla", device_class_value);  //device_class=energy
 			cJSON_AddStringToObject(info->root, "unit_of_meas", "Wh");   //unit_of_measurement
 		}