From 22836f224d01fa502bdb42e53f0839eb46b3a1a3 Mon Sep 17 00:00:00 2001
From: Koen Kanters <koenkanters94@gmail.com>
Date: Thu, 9 Dec 2021 19:52:21 +0100
Subject: [PATCH] Fix filtered attributes being published as `null`. #10099

---
 lib/controller.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/controller.ts b/lib/controller.ts
index f48b69327..a88eb16f3 100644
--- a/lib/controller.ts
+++ b/lib/controller.ts
@@ -254,15 +254,15 @@ class Controller {
             message.linkquality = entity.zh.linkquality;
         }
 
+        for (const extension of this.extensions) {
+            extension.adjustMessageBeforePublish?.(entity, message);
+        }
+
         // filter mqtt message attributes
         if (entity.settings.filtered_attributes) {
             entity.settings.filtered_attributes.forEach((a) => delete message[a]);
         }
 
-        for (const extension of this.extensions) {
-            extension.adjustMessageBeforePublish?.(entity, message);
-        }
-
         if (Object.entries(message).length) {
             const output = settings.get().experimental.output;
             if (output === 'attribute_and_json' || output === 'json') {