diff --git a/lib/zigbeecontroller.js b/lib/zigbeecontroller.js
index 24d5d12c..5531abdb 100644
--- a/lib/zigbeecontroller.js
+++ b/lib/zigbeecontroller.js
@@ -1061,8 +1061,8 @@ class ZigbeeController extends EventEmitter {
         if (this.localConfig.optionExists('ignore_device_delete')) {
             const entity = await this.resolveEntity(message.device || message.ieeeAddr);
             if (entity) {
-                if ((this.localConfig.getDeviceOption(entity.device.ieeeAddr, entity.model.modelID, false) ?? {}).ignore_device_delete) {
-                    this.warn(`Ignoring device_leave message from '${this.devLabel(message.ieeeAddr)}' (${entity.model.modelID})`);
+                if (this.localConfig.getDeviceOption(entity.device.ieeeAddr, entity.mapped?.model, 'ignore_device_delete', true)) {
+                    this.warn(`Ignoring device_leave message from '${this.devLabel(message.ieeeAddr)}' (${entity.device.modelID})`);
                     return;
                 }
             }