diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index ebefbb75..d2b41ab9 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -542,6 +542,7 @@ class GridFSProxy(object):
         return self
 
     def get(self, id=None):
+        if id: self.grid_id = id
         try: return self.fs.get(id or self.grid_id)
         except: return None # File has been deleted
 
@@ -611,7 +612,7 @@ class FileField(BaseField):
 
     def to_python(self, value):
         # Use stored value (id) to lookup file in GridFS
-        return self.gridfs.get()
+        return self.gridfs.get(id=value)
 
     def validate(self, value):
         assert isinstance(value, GridFSProxy)