diff --git a/frappe/model/document.py b/frappe/model/document.py
index 8eb45e8827..dd52262f64 100644
--- a/frappe/model/document.py
+++ b/frappe/model/document.py
@@ -464,8 +464,11 @@ class Document(BaseDocument):
 		if self.flags.name_set and not force:
 			return
 
+		meta = self.meta or frappe.get_meta(self.doctype)
+		autoname = meta.autoname or ""
+
 		# If autoname has set as Prompt (name)
-		if self.get("__newname"):
+		if self.get("__newname") and autoname == "Prompt":
 			self.name = validate_name(self.doctype, self.get("__newname"))
 			self.flags.name_set = True
 			return