diff --git a/frappe/public/js/frappe/form/sidebar/assign_to.js b/frappe/public/js/frappe/form/sidebar/assign_to.js
index f8461d1fdf..635e54d9b3 100644
--- a/frappe/public/js/frappe/form/sidebar/assign_to.js
+++ b/frappe/public/js/frappe/form/sidebar/assign_to.js
@@ -21,25 +21,21 @@ frappe.ui.form.AssignTo = Class.extend({
 	},
 	render: function(assignments) {
 		this.frm.get_docinfo().assignments = assignments;
-		this.parent.find(".assignment-row").remove();
-
-		if (this.primary_action) {
-			this.primary_action.remove();
-			this.primary_action = null;
-		}
-
-		if (this.dialog) {
-			this.dialog.hide();
-		}
 
 		let assignments_wrapper = this.parent.find('.assignments');
 
 		assignments_wrapper.empty();
 		let assigned_users = assignments.map(d => d.owner);
+
+		if (!assigned_users.length) {
+			assignments_wrapper.hide();
+			return;
+		}
+
 		let avatar_group = frappe.avatar_group(assigned_users, 5, {'align': 'left', 'overlap': true});
 
+		assignments_wrapper.show();
 		assignments_wrapper.append(avatar_group);
-
 		avatar_group.click(() => {
 			new frappe.ui.form.AssignmentDialog({
 				assignments: assigned_users,
@@ -48,28 +44,15 @@ frappe.ui.form.AssignTo = Class.extend({
 			});
 		});
 	},
-	get_assignment_block(info) {
-		let remove_action = false;
-		if (info.owner === frappe.session.user || this.frm.perm[0].write) {
-			remove_action = this.remove.bind(this);
-		}
-		return $(`<li class="assignment-row">`)
-			.append(frappe.get_data_pill(
-				frappe.user.full_name(info.owner),
-				info.owner,
-				remove_action,
-				frappe.avatar(info.owner, "avatar-xs")
-			));
-	},
 	add: function() {
 		var me = this;
 
-		if(this.frm.is_new()) {
+		if (this.frm.is_new()) {
 			frappe.throw(__("Please save the document before assignment"));
 			return;
 		}
 
-		if(!me.assign_to) {
+		if (!me.assign_to) {
 			me.assign_to = new frappe.ui.form.AssignToDialog({
 				method: "frappe.desk.form.assign_to.add",
 				doctype: me.frm.doctype,
diff --git a/frappe/public/js/frappe/form/sidebar/share.js b/frappe/public/js/frappe/form/sidebar/share.js
index b1b023ebba..2a3b652372 100644
--- a/frappe/public/js/frappe/form/sidebar/share.js
+++ b/frappe/public/js/frappe/form/sidebar/share.js
@@ -12,12 +12,9 @@ frappe.ui.form.Share = Class.extend({
 		this.render_sidebar();
 	},
 	render_sidebar: function() {
-		this.shares.empty();
 		const shared = this.shared || this.frm.get_docinfo().shared;
 		const shared_users = shared.filter(Boolean).map(s => s.user);
 
-		// REDESIGN-TODO: handle "shared with everyone"
-		this.shares.append(frappe.avatar_group(shared_users, 5, {'align': 'left', 'overlap': true}));
 		if (this.frm.is_new()) {
 			this.parent.find(".share-doc-btn").hide();
 		}
@@ -25,6 +22,17 @@ frappe.ui.form.Share = Class.extend({
 		this.parent.find(".share-doc-btn").on("click", () => {
 			this.frm.share_doc();
 		});
+
+		this.shares.empty();
+
+		if (!shared_users.length) {
+			this.shares.hide();
+			return;
+		}
+
+		this.shares.show();
+		// REDESIGN-TODO: handle "shared with everyone"
+		this.shares.append(frappe.avatar_group(shared_users, 5, {'align': 'left', 'overlap': true}));
 	},
 	show: function() {
 		var me = this;