diff --git a/components/gateway_knx/src/ets_device_runtime.cpp b/components/gateway_knx/src/ets_device_runtime.cpp
index e5eb68a..7b50d9c 100644
--- a/components/gateway_knx/src/ets_device_runtime.cpp
+++ b/components/gateway_knx/src/ets_device_runtime.cpp
@@ -51,6 +51,8 @@ bool IsBroadcastManagementRequest(CemiFrame& frame) {
     case IndividualAddressRead:
     case IndividualAddressSerialNumberRead:
     case IndividualAddressSerialNumberWrite:
+    case FunctionPropertyCommand:
+    case FunctionPropertyState:
       return true;
     default:
       return false;
diff --git a/components/gateway_knx/src/oam_router_runtime.cpp b/components/gateway_knx/src/oam_router_runtime.cpp
index a58fc85..8425f5b 100644
--- a/components/gateway_knx/src/oam_router_runtime.cpp
+++ b/components/gateway_knx/src/oam_router_runtime.cpp
@@ -64,6 +64,8 @@ bool IsBroadcastManagementRequest(CemiFrame& frame) {
     case IndividualAddressRead:
     case IndividualAddressSerialNumberRead:
     case IndividualAddressSerialNumberWrite:
+    case FunctionPropertyCommand:
+    case FunctionPropertyState:
       return true;
     default:
       return false;