diff --git a/pandora_console/include/ajax/module.php b/pandora_console/include/ajax/module.php
index 8cc2eca4a5..921a1e1bc0 100755
--- a/pandora_console/include/ajax/module.php
+++ b/pandora_console/include/ajax/module.php
@@ -621,7 +621,7 @@ if (check_login()) {
         }
 
         if (empty($table->data)) {
-            ui_print_error_message(__('No available data to show'));
+            ui_print_empty_data(__('No available data to show'), '', false);
         } else {
             ui_pagination(
                 count($count),
diff --git a/pandora_console/include/functions_treeview.php b/pandora_console/include/functions_treeview.php
index b408567aeb..025276ecef 100755
--- a/pandora_console/include/functions_treeview.php
+++ b/pandora_console/include/functions_treeview.php
@@ -892,11 +892,13 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
         $table_advanced->head = [];
         $table_advanced->data = [];
 
-        // Agent version.
-        $row = [];
+    $row = [];
+         // Agent version.
+    if (!empty($agent['agent_version'])) {
         $row['title'] = __('Agent Version');
         $row['data'] = $agent['agent_version'];
         $table_advanced->data['agent_version'] = $row;
+    }
 
         // Position Information.
     if ($config['activate_gis']) {
@@ -976,7 +978,7 @@ function treeview_printTable($id_agente, $server_data=[], $no_head=false)
         '',
         '',
         true,
-        false,
+        empty($table_advanced->data),
         '',
         'white-box-content mrgn_top_0 mrgn_btn_0px border-bottom-gray',
         'white_table_flex'