diff --git a/packages/modules/web_themes/colors/source/src/components/chargePointList/processMessages.ts b/packages/modules/web_themes/colors/source/src/components/chargePointList/processMessages.ts
index c310d1464f..408ab09577 100755
--- a/packages/modules/web_themes/colors/source/src/components/chargePointList/processMessages.ts
+++ b/packages/modules/web_themes/colors/source/src/components/chargePointList/processMessages.ts
@@ -59,6 +59,7 @@ export function processChargepointMessages(topic: string, message: string) {
 			topic.match(/^openWB\/chargepoint\/[0-9]+\/get\/daily_imported$/i)
 		) {
 			chargePoints[index].dailyYield = +message
+			chargePoints[index].now.energy = +message
 		} else if (topic.match(/^openwb\/chargepoint\/[0-9]+\/get\/plug_state$/i)) {
 			chargePoints[index].isPluggedIn = message == 'true'
 		} else if (
diff --git a/packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts b/packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts
index 8e44482a82..fc885560b2 100644
--- a/packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts
+++ b/packages/modules/web_themes/colors/source/src/components/consumerList/processMessages.ts
@@ -41,8 +41,6 @@ function processConsumerDeviceMessages(topic: string, message: string) {
 		}
 	} else if (topic.match(/^openWB\/consumer\/[0-9]+\/set\/on_time$/i)) {
 		dev.runningTime = +message
-	} else {
-		// console.warn('Ignored Consumer device message: ' + topic)
 	}
 }
 
@@ -55,7 +53,6 @@ function processConsumerConfigMessages(topic: string, message: string) {
 	}
 	if (!consumers.has(index)) {
 		console.warn('Invalid device id received: ' + index)
-		// addConsumer(index)
 	}
 	const dev = consumers.get(index)!
 	if (
@@ -68,15 +65,11 @@ function processConsumerConfigMessages(topic: string, message: string) {
 
 // Consumers global messages
 function processConsumerGlobalMessages(topic: string, message: string) {
-	if (topic.match(/^openWB\/consumer\/get\/daily_exported$/i)) {
-		//console.info('Consumer: Total exported energy: ' + message)
+	if (topic.match(/^openWB\/consumer\/get\/daily_imported$/i)) {
 		registry.setEnergy('consumers', +message)
 	} else if (topic.match(/^openWB\/consumer\/get\/power$/i)) {
-		//console.info('Consumer: Total power: ' + message)
 		registry.setPower('consumers', +message)
 		updateShSummary('power')
-	} else {
-		//console.warn('Ignored Consumer global message: ' + topic)
 	}
 }
 
diff --git a/packages/modules/web_themes/colors/source/src/components/powerMeter/PMUsageArc.vue b/packages/modules/web_themes/colors/source/src/components/powerMeter/PMUsageArc.vue
index 819692133a..df84121b39 100755
--- a/packages/modules/web_themes/colors/source/src/components/powerMeter/PMUsageArc.vue
+++ b/packages/modules/web_themes/colors/source/src/components/powerMeter/PMUsageArc.vue
@@ -115,9 +115,11 @@ const devicesToShow = computed(() => {
 })
 
 const consumersToShow = computed(() => {
-	return [...consumers.values()].sort((a, b) => {
-		return b.power - a.power
-	})
+	return [...consumers.values()]
+		.filter((c) => c.showInGraph)
+		.sort((a, b) => {
+			return b.power - a.power
+		})
 })
 
 const batteriesToShow = computed(() =>