From e071d7ee7e04feaa3536ccc6f511f401df6fba18 Mon Sep 17 00:00:00 2001
From: andig <andi@evcc.io>
Date: Fri, 19 Jun 2026 20:50:49 +0200
Subject: [PATCH] EEBus meter: fix nil entity panic on device removal (#31042)

---
 meter/eebus_events.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meter/eebus_events.go b/meter/eebus_events.go
index 6e1dc032f..a1ce1cae0 100644
--- a/meter/eebus_events.go
+++ b/meter/eebus_events.go
@@ -34,6 +34,11 @@ func (c *EEBus) Connect(connected bool) {
 
 // UseCaseEvent implements the eebus.Device interface
 func (c *EEBus) UseCaseEvent(_ spineapi.DeviceRemoteInterface, entity spineapi.EntityRemoteInterface, event eebusapi.EventType) {
+	// deviceremoval fires support-update events with a nil entity
+	if entity == nil {
+		return
+	}
+
 	switch event {
 	// Monitoring Appliance
 	case mpc.UseCaseSupportUpdate, mgcp.UseCaseSupportUpdate: