diff --git a/js/dataTables.pipeline.js b/js/dataTables.pipeline.js
index 592e6941f..f0f9c1e4b 100644
--- a/js/dataTables.pipeline.js
+++ b/js/dataTables.pipeline.js
@@ -26,36 +26,14 @@ $.fn.dataTable.pipeline = function (opts, initJson) {
 	var draw_number = 1;
 
 	return function (request, drawCallback, settings) {
-		let message = settings["oLanguage"]["processing"];
-		if (this.find('tbody').find('td').length == 0) {
-			this.find('tbody').append('<tr class="ibo-dataTables--processing"><td>&#160;</td></tr>');
-			this.find('tbody').block({
-				message: message,
-				css: {
-					border: '0px '
-				}
-			});
-			this.find('thead').block({
-				message: '',
-				css: {
-					border: '0px '
-				}
-			});
-		} else {
-			this.find('tbody').block({
-				message: '',
-				css: {
-					border: '0px '
-				}
-			});
-			this.find('thead').block({
-				message: message,
-				css: {
-					border: '0px ',
-					top: '20px',
-				}
-			});
-		}
+		let message = '<i class="fa fa-sync-alt fa-spin fa-x fa-fw"></i>';
+		this.closest('.dataTables_wrapper').block({
+			message: message,
+			css: {
+				border: '0px '
+			}
+		});
+
 		var ajax = false;
 		var requestStart = request.start;
 		var drawStart = request.start;
diff --git a/templates/base/components/datatable/layout.ready.js.twig b/templates/base/components/datatable/layout.ready.js.twig
index 7e11a9c60..c447a5550 100644
--- a/templates/base/components/datatable/layout.ready.js.twig
+++ b/templates/base/components/datatable/layout.ready.js.twig
@@ -85,7 +85,8 @@ var oTable{{ sListIDForVarSuffix }} = $('#{{ oUIBlock.GetId() }}').DataTable({
             } else {
                 $(this).closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info').show();
             }
-            
+
+            $(this).closest('.dataTables_wrapper').unblock();
             $("#{{ oUIBlock.GetId() }} a").on('click', function (e) {
                 //disable select action when there is a link
                 e.stopPropagation();
@@ -93,6 +94,7 @@ var oTable{{ sListIDForVarSuffix }} = $('#{{ oUIBlock.GetId() }}').DataTable({
         },
     {% else %}
         drawCallback: function () {
+            $(this).closest('.dataTables_wrapper').unblock();
             // Hiding pagination if only one page
             if ($(this).closest('.dataTables_wrapper').find('.dataTables_paginate:last .paginate_button:not(.previous):not(.next)').length < 2) {
                 $(this).closest('.dataTables_wrapper').find('.dataTables_paginate, .dataTables_info').hide();
@@ -181,9 +183,7 @@ var oTable{{ sListIDForVarSuffix }} = $('#{{ oUIBlock.GetId() }}').DataTable({
         {
             this.closest('.dataTables_wrapper').find('.dataTables_length').hide();
         }
-        this.find('.ibo-dataTables--processing').remove();
-        this.find('tbody').unblock();
-        this.find('thead').unblock();
+        this.closest('.dataTables_wrapper').unblock();
 
         {% if oUIBlock.GetOption("select_mode") is not empty %}
         updateDataTableSelection('{{ sListId }}', '{{ oUIBlock.GetId() }}');