diff --git a/pandora_console/godmode/reporting/reporting_builder.item_editor.php b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
index cc05d9d3f4..38ac32b635 100755
--- a/pandora_console/godmode/reporting/reporting_builder.item_editor.php
+++ b/pandora_console/godmode/reporting/reporting_builder.item_editor.php
@@ -1219,11 +1219,9 @@ $class = 'databox filters';
                 <?php
                 html_print_select(
                     $servers,
-                    'combo_server',
+                    'combo_server_sql',
                     $server_name,
-                    '',
-                    $nothing,
-                    $nothing_value
+                    ''
                 );
                 ?>
             </td>
diff --git a/pandora_console/godmode/reporting/reporting_builder.php b/pandora_console/godmode/reporting/reporting_builder.php
index 47ebb6ffff..e346c8f633 100755
--- a/pandora_console/godmode/reporting/reporting_builder.php
+++ b/pandora_console/godmode/reporting/reporting_builder.php
@@ -2210,7 +2210,14 @@ switch ($action) {
                             );
                             $values['top_n_value'] = get_parameter('max_items');
 
-                            $values['server_name'] = get_parameter('combo_server');
+                            if ($values['type'] === 'sql_graph_hbar'
+                                || ($values['type'] === 'sql_graph_vbar')
+                                || ($values['type'] === 'sql_graph_pie')
+                            ) {
+                                $values['server_name'] = get_parameter('combo_server_sql');
+                            } else {
+                                $values['server_name'] = get_parameter('combo_server');
+                            }
                         } else if ($values['type'] == 'url') {
                             $values['external_source'] = get_parameter('url');
                         } else if ($values['type'] == 'event_report_group') {