diff --git a/src/Adapters/Storage/Mongo/MongoSchemaCollection.js b/src/Adapters/Storage/Mongo/MongoSchemaCollection.js
index 5b9470f3..274d8c94 100644
--- a/src/Adapters/Storage/Mongo/MongoSchemaCollection.js
+++ b/src/Adapters/Storage/Mongo/MongoSchemaCollection.js
@@ -126,12 +126,6 @@ function mongoSchemaFromFieldsAndClassNameAndCLP(fields, className, classLevelPe
     }
   }
 
-  // Legacy mongo adapter knows about the difference between password and _hashed_password.
-  // Future database adapters will only know about _hashed_password.
-  // Note: Parse Server will bring back password with injectDefaultSchema, so we don't need
-  // to add it here.
-  delete mongoObject._hashed_password;
-
   return mongoObject;
 }
 
diff --git a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js
index c9776c7a..6082952f 100644
--- a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js
+++ b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js
@@ -37,6 +37,15 @@ const storageAdapterAllCollections = mongoAdapter => {
 const convertParseSchemaToMongoSchema = ({...schema}) => {
   delete schema.fields._rperm;
   delete schema.fields._wperm;
+
+  if (schema.className === '_User') {
+    // Legacy mongo adapter knows about the difference between password and _hashed_password.
+    // Future database adapters will only know about _hashed_password.
+    // Note: Parse Server will bring back password with injectDefaultSchema, so we don't need
+    // to add _hashed_password back ever.
+    delete schema.fields._hashed_password;
+  }
+
   return schema;
 }