diff --git a/src/Adapters/Storage/Mongo/MongoTransform.js b/src/Adapters/Storage/Mongo/MongoTransform.js
index ff025cfd09..48d64ed602 100644
--- a/src/Adapters/Storage/Mongo/MongoTransform.js
+++ b/src/Adapters/Storage/Mongo/MongoTransform.js
@@ -1243,6 +1243,9 @@ function mapValues(object, iterator) {
   const result = {};
   Object.keys(object).forEach(key => {
     result[key] = iterator(object[key]);
+    if (result[key] && JSON.stringify(result[key]).includes(`"__type"`)) {
+      result[key] = mapValues(object[key], iterator);
+    }
   });
   return result;
 }