diff --git a/CHANGES b/CHANGES
index 46e486fb68..b619125c9f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+3706.	[contrib]	queryperf: Fixed a possible integer overflow when
+			printing results. [RT #35182]
+
 3705.	[func]		"configure --enable-native-pkcs11" enables BIND
 			to use the PKCS#11 API for all cryptographic
 			functions, so that it can drive a hardware service
diff --git a/contrib/queryperf/queryperf.c b/contrib/queryperf/queryperf.c
index 6b153271ae..0738cc2903 100644
--- a/contrib/queryperf/queryperf.c
+++ b/contrib/queryperf/queryperf.c
@@ -2170,12 +2170,21 @@ main(int argc, char **argv) {
 	printf("[Status] Processing input data\n");
 
 	while ((sending = keep_sending(&got_eof)) == TRUE ||
-	       queries_outstanding() > 0) {
-		print_interval_statistics();
+	       queries_outstanding() > 0)
+	{
+		if (num_queries_sent_interval > 0){
+			/*
+			 * After statistics are printed, send_query()
+			 * needs to be called at least once so that
+			 * time_of_first_query_interval is reset
+			 */
+			print_interval_statistics();
+		}
 		adjust_rate = FALSE;
 
 		while ((sending = keep_sending(&got_eof)) == TRUE &&
-		       queries_outstanding() < max_queries_outstanding) {
+		       queries_outstanding() < max_queries_outstanding)
+		{
 			int len = next_input_line(input_line, input_length);
 			if (len == 0) {
 				got_eof = TRUE;