diff --git a/js/server_status_queries.js b/js/server_status_queries.js
index a5d75ea45f..7280896a0d 100644
--- a/js/server_status_queries.js
+++ b/js/server_status_queries.js
@@ -16,9 +16,10 @@ AJAX.registerOnload('server_status_queries.js', function () {
     // Build query statistics chart
     var cdata = [];
     try {
-        $.each(JSON.parse($('#serverstatusquerieschart_data').text()), function (key, value) {
+        $.each(JSON.parse($('#serverstatusquerieschart').text()), function (key, value) {
             cdata.push([key, parseInt(value, 10)]);
         });
+        $('#serverstatusquerieschart').empty();
         $('#serverstatusquerieschart').data(
             'queryPieChart',
             PMA_createProfilingChart(
diff --git a/libraries/server_status_queries.lib.php b/libraries/server_status_queries.lib.php
index 2bbbaafe15..c9fe123d73 100644
--- a/libraries/server_status_queries.lib.php
+++ b/libraries/server_status_queries.lib.php
@@ -134,8 +134,7 @@ function PMA_getHtmlForServerStatusQueriesDetails($ServerStatusData)
     $retval .= '</tbody>';
     $retval .= '</table>';
 
-    $retval .= '<div id="serverstatusquerieschart"></div>';
-    $retval .= '<div id="serverstatusquerieschart_data" style="display:none;">';
+    $retval .= '<div id="serverstatusquerieschart">';
     if ($other_sum > 0) {
         $chart_json[__('Other')] = $other_sum;
     }
diff --git a/test/libraries/PMA_server_status_queries_test.php b/test/libraries/PMA_server_status_queries_test.php
index af23c3bfc3..50406c2799 100644
--- a/test/libraries/PMA_server_status_queries_test.php
+++ b/test/libraries/PMA_server_status_queries_test.php
@@ -219,12 +219,9 @@ class PMA_ServerStatusQueries_Test extends PHPUnit_Framework_TestCase
 
         //validate 3:serverstatusquerieschart
         $this->assertContains(
-            '<div id="serverstatusquerieschart"></div>',
-            $html
-        );
-        $this->assertContains(
-            '<div id="serverstatusquerieschart_data"',
+            '<div id="serverstatusquerieschart">',
             $html
         );
+
     }
 }