diff --git a/frappe/core/doctype/file/file.py b/frappe/core/doctype/file/file.py
index 2eac72a6de..5011632663 100755
--- a/frappe/core/doctype/file/file.py
+++ b/frappe/core/doctype/file/file.py
@@ -386,8 +386,6 @@ class File(Document):
 
 			if self.name:
 				filters.update({"name": ("!=", self.name)})
-			else:
-				filters.update({"file_name": self.file_name})
 
 			if self.attached_to_doctype and self.attached_to_name:
 				filters.update(
@@ -663,7 +661,11 @@ class File(Document):
 		if duplicate_file:
 			file_doc: File = frappe.get_cached_doc("File", duplicate_file.name)
 			if file_doc.exists_on_disk():
-				self.file_url = duplicate_file.file_url
+				if self.exists_on_disk():
+					if not self.file_url:
+						self.file_url = duplicate_file.file_url
+				else:
+					self.file_url = duplicate_file.file_url
 				file_exists = True
 
 		if not file_exists: