diff --git a/mayan/apps/documents/models.py b/mayan/apps/documents/models.py
index 04d68ff4e4..ff6103f766 100644
--- a/mayan/apps/documents/models.py
+++ b/mayan/apps/documents/models.py
@@ -81,7 +81,7 @@ class Document(models.Model):
     """
     _latest_versions = {}
 
-    uuid = models.CharField(max_length=48, blank=True, editable=False)
+    uuid = models.CharField(default=lambda: UUID_FUNCTION(), max_length=48, editable=False)
     document_type = models.ForeignKey(DocumentType, verbose_name=_(u'Document type'), related_name='documents')
     description = models.TextField(blank=True, null=True, verbose_name=_(u'Description'))
     date_added = models.DateTimeField(verbose_name=_(u'Added'), auto_now_add=True)
@@ -116,8 +116,6 @@ class Document(models.Model):
     def save(self, *args, **kwargs):
         user = kwargs.pop('user', None)
         new_document = not self.pk
-        if new_document:
-            self.uuid = UUID_FUNCTION()
         super(Document, self).save(*args, **kwargs)
 
         if new_document: