diff --git a/converters/fromZigbee.js b/converters/fromZigbee.js
index 2fd42537d3b5e..6f8d2d355dcaf 100644
--- a/converters/fromZigbee.js
+++ b/converters/fromZigbee.js
@@ -171,7 +171,7 @@ const getProperty = (name, msg, definition) => {
     if (definition.meta && definition.meta.multiEndpoint) {
         const endpointName = definition.hasOwnProperty('endpoint') ?
             getKey(definition.endpoint(msg.device), msg.endpoint.ID) : msg.endpoint.ID;
-        return endpointName ? `${name}_${endpointName}` : null;
+        return `${name}_${endpointName}`;
     } else {
         return name;
     }
@@ -527,7 +527,6 @@ const converters = {
         convert: (model, msg, publish, options, meta) => {
             if (msg.data.hasOwnProperty('currentLevel')) {
                 const property = getProperty('brightness', msg, model);
-                if (!property) return;
                 return {[property]: msg.data['currentLevel']};
             }
         },
@@ -604,7 +603,6 @@ const converters = {
                 if (msg.data.hasOwnProperty(entry.key)) {
                     const factor = getFactor(entry.factor);
                     const property = getProperty(entry.name, msg, model);
-                    if (!property) continue;
                     payload[property] = precisionRound(msg.data[entry.key] * factor, 2);
                 }
             }
@@ -617,7 +615,6 @@ const converters = {
         convert: (model, msg, publish, options, meta) => {
             if (msg.data.hasOwnProperty('onOff')) {
                 const property = getProperty('state', msg, model);
-                if (!property) return;
                 return {[property]: msg.data['onOff'] === 1 ? 'ON' : 'OFF'};
             }
         },