diff --git a/flow-server/src/main/java/com/vaadin/flow/server/communication/rpc/MapSyncRpcHandler.java b/flow-server/src/main/java/com/vaadin/flow/server/communication/rpc/MapSyncRpcHandler.java index 930e4e811d0..e408b07cbf1 100644 --- a/flow-server/src/main/java/com/vaadin/flow/server/communication/rpc/MapSyncRpcHandler.java +++ b/flow-server/src/main/java/com/vaadin/flow/server/communication/rpc/MapSyncRpcHandler.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Optional; +import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.vaadin.flow.component.Component; @@ -112,10 +113,20 @@ protected Optional handleNode(StateNode node, return enqueuePropertyUpdate(node, invocationJson, feature, property); } else { - LoggerFactory.getLogger(MapSyncRpcHandler.class) - .warn("Property update request for disabled element is received from the client side. " - + "The property is '{}'. Request is ignored.", - property); + final Logger logger = LoggerFactory + .getLogger(MapSyncRpcHandler.class); + if (node.getFeatureIfInitialized(ElementPropertyMap.class) + .map(feat -> feat.getProperty(property)) + .orElse(null) != null) { + logger.warn( + "Property update request for disabled element is received from the client side. " + + "The property is '{}'. Request is ignored.", + property); + } else { + logger.debug( + "Ignored property '{}' change for disabled element. Most likely client sent the default value as no value has been set for the property.", + property); + } } return Optional.empty(); }