diff --git a/CHANGES b/CHANGES
index 7aaf1acae2..67e113f629 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+3507.	[bug]		Statistics channel XSL (when built with
+			--enable-newstats) had a glitch when attempting
+			to chart query data before any queries had been
+			received. [RT #32620]
+
 3505.	[bug]		When setting "max-cache-size" and "max-acache-size",
 			larger values than 4 gigabytes could not be set
 			explicitly, though larger sizes were available
diff --git a/bin/named/bind9.ver3.xsl b/bin/named/bind9.ver3.xsl
index a2b6b9ee78..fe5b6455fe 100644
--- a/bin/named/bind9.ver3.xsl
+++ b/bin/named/bind9.ver3.xsl
@@ -50,10 +50,11 @@
             
           // Server Incoming query Types
           while(g = graphs.shift()){
-           // alert("going for: " + g.target);
-            drawChart(g.title,g.target,g.data);
+            // alert("going for: " + g.target);
+            if(g.data.length > 1){
+              drawChart(g.title,g.target,g.data);
+            }
           }
-            
         }
         
             // Server Incoming Queries Types         
@@ -207,7 +208,7 @@
         <h2>Incoming Requests</h2>
         <xsl:if test="system-property('xsl:vendor')!='Transformiix'">
           <!-- Non Mozilla specific markup -->
-          <div class="pie" id="chart_incoming_requests">[graph incoming requests]</div>
+          <div class="pie" id="chart_incoming_requests">[graph of incoming requests]</div>
         </xsl:if>
         <table class="counters">
           <xsl:for-each select="server/counters[@type=&quot;opcode&quot;]/counter">
@@ -232,7 +233,7 @@
         <h3>Incoming Queries by Type</h3>
         <xsl:if test="system-property('xsl:vendor')!='Transformiix'">
           <!-- Non Mozilla specific markup -->
-          <div class="pie" id="chart_incoming_qtypes">[graph incoming qtypes]</div>
+          <div class="pie" id="chart_incoming_qtypes">[graph of incoming qtypes]</div>
         </xsl:if>
         <table class="counters">
           <xsl:for-each select="server/counters[@type=&quot;qtype&quot;]/counter">
diff --git a/bin/named/bind9.ver3.xsl.h b/bin/named/bind9.ver3.xsl.h
index c6042c7a5f..c55714a6fb 100644
--- a/bin/named/bind9.ver3.xsl.h
+++ b/bin/named/bind9.ver3.xsl.h
@@ -53,9 +53,10 @@ static char xslmsg[] =
 	" // Server Incoming query Types\n"
 	" while(g = graphs.shift()){\n"
 	" // alert(\"going for: \" + g.target);\n"
+	" if(g.data.length > 1){\n"
 	" drawChart(g.title,g.target,g.data);\n"
 	" }\n"
-	" \n"
+	" }\n"
 	" }\n"
 	" \n"
 	" // Server Incoming Queries Types \n"