diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6db52296c18..89cc796248c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -146,9 +146,9 @@ Apache UIMA 2.3.1
 Apache ZooKeeper 3.4.6
 Jetty 9.3.14.v20161028
 
-
-(No Changes)
-
+Bug Fixes
+----------------------
+* SOLR-9969: "Plugin/Stats" section of the UI doesn't display empty metric types (Tomás Fernández Löbbe)
 
 ==================  6.4.0 ==================
 
diff --git a/solr/webapp/web/js/angular/controllers/plugins.js b/solr/webapp/web/js/angular/controllers/plugins.js
index 9070b84023b..a537b37d7c3 100644
--- a/solr/webapp/web/js/angular/controllers/plugins.js
+++ b/solr/webapp/web/js/angular/controllers/plugins.js
@@ -88,6 +88,7 @@ var getPluginTypes = function(data, selected) {
         var key = mbeans[i];
         var lower = key.toLowerCase();
         var plugins = getPlugins(mbeans[i+1]);
+        if (plugins.length == 0) continue;
         keys.push({name: key,
                    selected: lower == selected,
                    changes: 0,