diff --git a/lib/src/network/parse_live_query.dart b/lib/src/network/parse_live_query.dart
index 6dd0b3a76..5b11aadd9 100644
--- a/lib/src/network/parse_live_query.dart
+++ b/lib/src/network/parse_live_query.dart
@@ -11,7 +11,7 @@ class LiveQuery {
             securityContext: ParseCoreData().securityContext);
 
     _debug = isDebugEnabled(objectLevelDebug: debug);
-    _sendSessionId = autoSendSessionId ?? ParseCoreData().autoSendSessionId;
+    _sendSessionId = autoSendSessionId ?? ParseCoreData().autoSendSessionId ?? true;
   }
 
   WebSocket _webSocket;
diff --git a/lib/src/utils/parse_encoder.dart b/lib/src/utils/parse_encoder.dart
index 322d83b2c..9582d54a7 100644
--- a/lib/src/utils/parse_encoder.dart
+++ b/lib/src/utils/parse_encoder.dart
@@ -27,11 +27,11 @@ dynamic parseEncode(dynamic value, {bool full}) {
   }
 
   if (value is ParseGeoPoint) {
-    return value;
+    return value.toJson();
   }
 
   if (value is ParseFile) {
-    return value;
+    return value.toJson();
   }
 
   if (value is ParseRelation) {