diff --git a/js/linkswidget.js b/js/linkswidget.js
index d7a51736c7..61c0ccd9e6 100644
--- a/js/linkswidget.js
+++ b/js/linkswidget.js
@@ -61,7 +61,7 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
 	this.RemoveSelected = function () {
 		let my_id = '#'+me.id;
 		$('#linkedset_'+me.id+' .selection:checked').closest('tr').each(function () {
-			$('#datatable_'+me.id).DataTable().row($(this)).remove().draw();
+			$('#datatable_'+me.id).DataTable().row($(this)).remove();
 			var oCheckbox = $(this).find('.selection');
 			let iLink = $(oCheckbox).attr('data-link-id');
 			if (iLink > 0) {
@@ -80,6 +80,9 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
 				me.aAdded[iUniqueId] = null;
 			}
 		});
+		// N°6124 Only draw table once for performance reasons
+		$('#datatable_'+me.id).DataTable().draw();
+
 		// Disable the button since all the selected items have been removed
 		$(my_id+'_btnRemove').prop('disabled', true);
 
@@ -251,9 +254,10 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
 			function (data) {
 				if (data != '') {
 					$.each(data.data, function (idx, row) {
-						$('#datatable_'+me.id).DataTable().row.add(row).draw();
+						$('#datatable_'+me.id).DataTable().row.add(row);
 					});
-
+					// N°6124 Only draw table once for performance reasons
+					$('#datatable_'+me.id).DataTable().draw();
 
 					$.each(data.scripts, function (idx, script) {
 						$.globalEval(script);
@@ -263,7 +267,6 @@ function LinksWidget(id, sClass, sAttCode, iInputId, sSuffix, bDuplicates, oWizH
 						$(this).trigger('validate', '');
 					}); // Validate newly added form fields...
 					$('#datatable_'+me.id).DataTable().columns.adjust().draw();
-					//$('#datatable_team_list').DataTable().columns.adjust().draw();
 					$('#busy_'+me.iInputId).html('');
 				}
 			},