1 files changed, 7 insertions, 4 deletions
diff --git a/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java b/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java
index 177d12004c..3ba52a4e91 100644
--- a/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java
+++ b/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java
@@ -838,10 +838,13 @@ public class JsonCodec implements Serializable {
         JSONObject jsonMap = new JSONObject();
 
         for (Entry<?, ?> entry : map.entrySet()) {
-            Connector key = (Connector) entry.getKey();
-            EncodeResult encodedValue = encode(entry.getValue(), null,
-                    valueType, connectorTracker);
-            jsonMap.put(key.getConnectorId(), encodedValue.getEncodedValue());
+            ClientConnector key = (ClientConnector) entry.getKey();
+            if (AbstractCommunicationManager.isVisible(key)) {
+                EncodeResult encodedValue = encode(entry.getValue(), null,
+                        valueType, connectorTracker);
+                jsonMap.put(key.getConnectorId(),
+                        encodedValue.getEncodedValue());
+            }
         }
 
         return jsonMap;