1 files changed, 1 insertions, 1 deletions
diff --git a/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java b/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java
index cb0a604b89..892f7ec526 100644
--- a/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java
+++ b/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java
@@ -620,7 +620,7 @@ public class JsonCodec implements Serializable {
                 Object fieldValue = getterMethod.invoke(value, (Object[]) null);
                 boolean equals = false;
                 Object diffStateValue = null;
-                if (diffState != null) {
+                if (diffState != null && diffState.has(fieldName)) {
                     diffStateValue = diffState.get(fieldName);
                     Object referenceFieldValue = decodeInternalOrCustomType(
                             fieldType, diffStateValue, connectorTracker);