diff --git a/source/_docs/z-wave/control-panel.markdown b/source/_docs/z-wave/control-panel.markdown
index 7bc3d006b64..81ae4b9918b 100644
--- a/source/_docs/z-wave/control-panel.markdown
+++ b/source/_docs/z-wave/control-panel.markdown
@@ -51,6 +51,24 @@ Since 0.63 and the new experimental [entity registry](/docs/configuration/entity
 Battery powered devices need to be awake before you can use the Z-Wave control panel to update their settings. How to wake your device is device specific, and some devices will stay awake for only a couple of seconds. Please refer to the manual of your device for more details.
 </p>
 
+### {% linkable_title Renaming all entities of a node %}
+
+When you use *Rename Node* it, as mentioned above, only changes the `zwave.` entity. If you've just added a device then the other entities for that device will use that new entity name as the base. However existing entities won't be renamed, so you need to remove them from `entity_registry.yaml`, and the process is like this:
+
+1. Use *Rename Node* to rename the `zwave.` entity and set the base for all the other entities
+2. Shut down Home Assistant and wait for it to stop
+3. Delete the relevant entries from `entity_registry.yaml`
+4. Start Home Assistant again
+
+Each block you need to delete will look something like this, you need to delete all 4 lines for each entry. The first number of the `unique-id` is the Node ID of the Z-Wave node.
+
+```yaml
+sensor.fibaro_door_sensor_access_control:
+  name:
+  platform: zwave
+  unique_id: 5-72057594126614528
+```
+
 #### {% linkable_title Entities of this node %}
 
 This is a dropdown where you can select all the entities of this node. Once selected you can then use: