diff --git a/Parse/src/main/java/com/parse/ParseObject.java b/Parse/src/main/java/com/parse/ParseObject.java
index 903c210e4..61a9cc16d 100644
--- a/Parse/src/main/java/com/parse/ParseObject.java
+++ b/Parse/src/main/java/com/parse/ParseObject.java
@@ -127,7 +127,7 @@ public Init(String className) {
         objectId = state.objectId();
         createdAt = state.createdAt();
         updatedAt = state.updatedAt();
-        availableKeys = state.availableKeys();
+        availableKeys = Collections.synchronizedSet(state.availableKeys());
         for (String key : state.keySet()) {
           serverData.put(key, state.get(key));
           availableKeys.add(key);
@@ -273,7 +273,7 @@ public State build() {
           : createdAt;
       serverData = Collections.unmodifiableMap(new HashMap<>(builder.serverData));
       isComplete = builder.isComplete;
-      availableKeys = new HashSet<>(builder.availableKeys);
+      availableKeys = Collections.synchronizedSet(builder.availableKeys);
     }
 
     /* package */ State(Parcel parcel, String clazz, ParseParcelDecoder decoder) {