diff --git a/frappe/core/doctype/file/file.js b/frappe/core/doctype/file/file.js
index 828865a161..ecad8d884a 100644
--- a/frappe/core/doctype/file/file.js
+++ b/frappe/core/doctype/file/file.js
@@ -9,19 +9,9 @@ frappe.ui.form.on("File", "refresh", function(frm) {
 		}, "fa fa-download");
 	}
 
-	var wrapper = frm.get_field("preview_html").$wrapper;
-	var is_viewable = frappe.utils.is_image_file(frm.doc.file_url);
-
-	frm.toggle_display("preview", is_viewable);
-	frm.toggle_display("preview_html", is_viewable);
-
-	if(is_viewable){
-		wrapper.html('<div class="img_preview">\
-			<img class="img-responsive" src="'+frm.doc.file_url+'"></img>\
-			</div>');
-	} else {
-		wrapper.empty();
-	}
+	frm.get_field("preview_html").$wrapper.html(`<div class="img_preview">
+		<img class="img-responsive" src="${frm.doc.file_url}" onerror="cur_frm.toggle_display('preview', false)" />
+	</div>`);
 
 	var is_raster_image = (/\.(gif|jpg|jpeg|tiff|png)$/i).test(frm.doc.file_url);
 	var is_optimizable = !frm.doc.is_folder && is_raster_image && frm.doc.file_size > 0;
diff --git a/frappe/public/js/frappe/form/sidebar/attachments.js b/frappe/public/js/frappe/form/sidebar/attachments.js
index ddf7209ee8..effe3a575b 100644
--- a/frappe/public/js/frappe/form/sidebar/attachments.js
+++ b/frappe/public/js/frappe/form/sidebar/attachments.js
@@ -185,7 +185,7 @@ frappe.ui.form.Attachments = class Attachments {
 				this.attachment_uploaded(file_doc);
 			},
 			restrictions: {
-				max_number_of_files: this.frm.meta.max_attachments,
+				max_number_of_files: this.frm.meta.max_attachments - this.frm.attachments.get_attachments().length,
 			}
 		});
 	}