diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index e9521010..664edb53 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -133,6 +133,9 @@ class EmbeddedDocumentField(BaseField):
     def lookup_member(self, member_name):
         return self.document._fields.get(member_name)
 
+    def prepare_query_value(self, value):
+        return self.to_mongo(value)
+
 
 class ListField(BaseField):
     """A list field that wraps a standard field, allowing multiple instances
@@ -165,6 +168,9 @@ class ListField(BaseField):
             raise ValidationError('All items in a list field must be of the '
                                   'specified type')
 
+    def prepare_query_value(self, value):
+        return self.field.to_mongo(value)
+
     def lookup_member(self, member_name):
         return self.field.lookup_member(member_name)