diff --git a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js
index b4e1f84e..65eca277 100644
--- a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js
+++ b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js
@@ -199,10 +199,10 @@ export class MongoStorageAdapter {
 
   // Executes a find. Accepts: className, query in Parse format, and { skip, limit, sort }.
   // Accepts the schemaController for legacy reasons.
-  find(className, query, { skip, limit, sort }, schemaController) {
+  find(className, query, { skip, limit, sort }, schemaController, schema) {
     return this.adaptiveCollection(className)
     .then(collection => collection.find(query, { skip, limit, sort }))
-    .then(objects => objects.map(object => transform.mongoObjectToParseObject(schemaController, className, object)));
+    .then(objects => objects.map(object => transform.mongoObjectToParseObject(schemaController, className, object, schema)));
   }
 
   get transform() {
diff --git a/src/Adapters/Storage/Mongo/MongoTransform.js b/src/Adapters/Storage/Mongo/MongoTransform.js
index 3bb008f7..7708ed38 100644
--- a/src/Adapters/Storage/Mongo/MongoTransform.js
+++ b/src/Adapters/Storage/Mongo/MongoTransform.js
@@ -755,7 +755,7 @@ const nestedMongoObjectToNestedParseObject = mongoObject => {
 
 // Converts from a mongo-format object to a REST-format object.
 // Does not strip out anything based on a lack of authentication.
-const mongoObjectToParseObject = (schema, className, mongoObject) => {
+const mongoObjectToParseObject = (schemaController, className, mongoObject, schema) => {
   switch(typeof mongoObject) {
   case 'string':
   case 'number':
@@ -831,8 +831,8 @@ const mongoObjectToParseObject = (schema, className, mongoObject) => {
         if (key.indexOf('_p_') == 0) {
           var newKey = key.substring(3);
           var expected;
-          if (schema && schema.getExpectedType) {
-            expected = schema.getExpectedType(className, newKey);
+          if (schemaController && schemaController.getExpectedType) {
+            expected = schemaController.getExpectedType(className, newKey);
           }
           if (!expected) {
             log.info('transform.js',
@@ -861,7 +861,7 @@ const mongoObjectToParseObject = (schema, className, mongoObject) => {
         } else if (key[0] == '_' && key != '__type') {
           throw ('bad key in untransform: ' + key);
         } else {
-          var expectedType = schema.getExpectedType(className, key);
+          var expectedType = schemaController.getExpectedType(className, key);
           var value = mongoObject[key];
           if (expectedType && expectedType.type === 'File' && FileCoder.isValidDatabaseObject(value)) {
             restObject[key] = FileCoder.databaseToJSON(value);
@@ -876,7 +876,7 @@ const mongoObjectToParseObject = (schema, className, mongoObject) => {
       }
     }
 
-    return { ...restObject, ...schema.getRelationFields(className) };
+    return { ...restObject, ...schemaController.getRelationFields(className) };
   default:
     throw 'unknown js type';
   }
diff --git a/src/Controllers/DatabaseController.js b/src/Controllers/DatabaseController.js
index 67240a91..56edb8e0 100644
--- a/src/Controllers/DatabaseController.js
+++ b/src/Controllers/DatabaseController.js
@@ -701,7 +701,7 @@ DatabaseController.prototype.find = function(className, query, {
           delete mongoOptions.limit;
           return collection.count(mongoWhere, mongoOptions);
         } else {
-          return this.adapter.find(className, mongoWhere, mongoOptions, schemaController)
+          return this.adapter.find(className, mongoWhere, mongoOptions, schemaController, schema)
           .then(objects => objects.map(object => filterSensitiveData(isMaster, aclGroup, className, object)));
         }
       });