diff --git a/apps/documents/models.py b/apps/documents/models.py
index fde623b506..2d9482782a 100644
--- a/apps/documents/models.py
+++ b/apps/documents/models.py
@@ -24,7 +24,9 @@ def get_filename_from_uuid(instance, filename):
     instance.file_filename = filename
     #remove prefix '.'
     instance.file_extension = extension[1:]
-    return instance.uuid
+    uuid = UUID_FUNCTION()
+    instance.uuid = uuid
+    return uuid
    
 
 class DocumentType(models.Model):