diff --git a/homeassistant/components/velbus/entity.py b/homeassistant/components/velbus/entity.py
index 65f8a1d8d31..82d06cdca28 100644
--- a/homeassistant/components/velbus/entity.py
+++ b/homeassistant/components/velbus/entity.py
@@ -40,6 +40,10 @@ class VelbusEntity(Entity):
         """Add listener for state changes."""
         self._channel.on_status_update(self._on_update)
 
+    async def async_will_remove_from_hass(self) -> None:
+        """Remove listener for state changes."""
+        self._channel.remove_on_status_update(self._on_update)
+
     async def _on_update(self) -> None:
         self.async_write_ha_state()
 
diff --git a/homeassistant/components/velbus/quality_scale.yaml b/homeassistant/components/velbus/quality_scale.yaml
index b045493f4e4..05e9c168b92 100644
--- a/homeassistant/components/velbus/quality_scale.yaml
+++ b/homeassistant/components/velbus/quality_scale.yaml
@@ -17,7 +17,7 @@ rules:
   docs-high-level-description: done
   docs-installation-instructions: done
   docs-removal-instructions: done
-  entity-event-setup: todo
+  entity-event-setup: done
   entity-unique-id: done
   has-entity-name: todo
   runtime-data: done