diff --git a/ChangeLog b/ChangeLog
index 73087d2f72..48edcb14a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -69,6 +69,7 @@ phpMyAdmin - ChangeLog
 - issue #12985 Fixed rendering of foreign key browsing
 - issue #12957 Fixed manipulation with GIS data having zero coordinates
 - issue #12804 Fixed various designer javascript errors
+- issue #12934 Fixed possible javascript error on server status page
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'
diff --git a/server_status_queries.php b/server_status_queries.php
index 8e85be87c6..77014b05a0 100644
--- a/server_status_queries.php
+++ b/server_status_queries.php
@@ -22,7 +22,6 @@ $serverStatusData = new ServerStatusData();
 $response = Response::getInstance();
 $header   = $response->getHeader();
 $scripts  = $header->getScripts();
-$scripts->addFile('server_status_queries.js');
 
 // for charting
 $scripts->addFile('chart.js');
@@ -31,6 +30,7 @@ $scripts->addFile('jqplot/plugins/jqplot.pieRenderer.js');
 $scripts->addFile('jqplot/plugins/jqplot.highlighter.js');
 $scripts->addFile('jquery/jquery.tablesorter.js');
 $scripts->addFile('server_status_sorter.js');
+$scripts->addFile('server_status_queries.js');
 
 // Add the html content to the response
 $response->addHTML('<div>');