diff --git a/frappe/core/doctype/doctype/doctype.py b/frappe/core/doctype/doctype/doctype.py
index 1c8c1f9217..a6a81cb195 100644
--- a/frappe/core/doctype/doctype/doctype.py
+++ b/frappe/core/doctype/doctype/doctype.py
@@ -75,6 +75,7 @@ class DocType(Document):
 		self.make_repeatable()
 		self.validate_nestedset()
 		self.validate_website()
+		self.ensure_minimum_max_attachment_limit()
 		validate_links_table_fieldnames(self)
 
 		if not self.is_new():
@@ -246,6 +247,22 @@ class DocType(Document):
 			# clear website cache
 			clear_cache()
 
+	def ensure_minimum_max_attachment_limit(self):
+		"""Ensure that max_attachments is *at least* bigger than number of attach fields."""
+		from frappe.model import attachment_fieldtypes
+
+
+		if not self.max_attachments:
+			return
+
+		total_attach_fields = len([d for d in self.fields if d.fieldtype in attachment_fieldtypes])
+		if total_attach_fields > self.max_attachments:
+			self.max_attachments = total_attach_fields
+			field_label = frappe.bold(self.meta.get_field("max_attachments").label)
+			frappe.msgprint(_("Number of attachment fields are more than {}, limit updated to {}.")
+					.format(field_label, total_attach_fields),
+					title=_("Insufficient attachment limit"), alert=True)
+
 	def change_modified_of_parent(self):
 		"""Change the timestamp of parent DocType if the current one is a child to clear caches."""
 		if frappe.flags.in_import:
diff --git a/frappe/model/__init__.py b/frappe/model/__init__.py
index b460db29a7..b50a0304a5 100644
--- a/frappe/model/__init__.py
+++ b/frappe/model/__init__.py
@@ -38,6 +38,11 @@ data_fieldtypes = (
 	'Icon'
 )
 
+attachment_fieldtypes = (
+	'Attach',
+	'Attach Image',
+)
+
 no_value_fields = (
 	'Section Break',
 	'Column Break',