1 files changed, 3 insertions, 4 deletions
diff --git a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
index b32525a703..d6feba9dc0 100644
--- a/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java
@@ -846,11 +846,10 @@ public abstract class AbstractCommunicationManager implements Serializable {
                                             + stateType.getName());
                         }
                     }
-                    JSONArray stateJsonArray = JsonCodec.encode(state,
-                            referenceState, stateType, application);
+                    Object stateJson = JsonCodec.encode(state, referenceState,
+                            stateType, application);
 
-                    sharedStates
-                            .put(connector.getConnectorId(), stateJsonArray);
+                    sharedStates.put(connector.getConnectorId(), stateJson);
                 } catch (JSONException e) {
                     throw new PaintException(
                             "Failed to serialize shared state for connector "