diff --git a/docker/test/performance-comparison/compare.sh b/docker/test/performance-comparison/compare.sh
index b3cf1649cec..c916fe4a639 100755
--- a/docker/test/performance-comparison/compare.sh
+++ b/docker/test/performance-comparison/compare.sh
@@ -514,16 +514,20 @@ create table queries engine File(TSVWithNamesAndTypes, 'report/queries.tsv')
     ;
 
 create table changed_perf_report engine File(TSV, 'report/changed-perf.tsv') as
-    select
-        toDecimal64(left, 3), toDecimal64(right, 3),
+    with
         -- server_time is sometimes reported as zero (if it's less than 1 ms),
         -- so we have to work around this to not get an error about conversion
         -- of NaN to decimal.
-        left > right
-            ? '- ' || toString(toDecimal64(left / (right + 0.001), 3)) || 'x'
-            : '+ ' || toString(toDecimal64(right / (left + 0.001), 3)) || 'x',
-         toDecimal64(diff, 3), toDecimal64(stat_threshold, 3),
-         changed_fail, test, query_index, query_display_name
+        (left > right ? left / right : right / left) as times_change_float,
+        isFinite(times_change_float) as times_change_finite,
+        toDecimal64(times_change_finite ? times_change_float : 1., 3) as times_change_decimal,
+        times_change_finite
+            ? (left > right ? '-' : '+') || toString(times_change_decimal) || 'x'
+            : '--' as times_change_str
+    select
+        toDecimal64(left, 3), toDecimal64(right, 3), times_change_str,
+        toDecimal64(diff, 3), toDecimal64(stat_threshold, 3),
+        changed_fail, test, query_index, query_display_name
     from queries where changed_show order by abs(diff) desc;
 
 create table unstable_queries_report engine File(TSV, 'report/unstable-queries.tsv') as
@@ -603,11 +607,18 @@ create table test_times_report engine File(TSV, 'report/test-times.tsv') as
 
 -- report for all queries page, only main metric
 create table all_tests_report engine File(TSV, 'report/all-queries.tsv') as
+    with
+        -- server_time is sometimes reported as zero (if it's less than 1 ms),
+        -- so we have to work around this to not get an error about conversion
+        -- of NaN to decimal.
+        (left > right ? left / right : right / left) as times_change_float,
+        isFinite(times_change_float) as times_change_finite,
+        toDecimal64(times_change_finite ? times_change_float : 1., 3) as times_change_decimal,
+        times_change_finite
+            ? (left > right ? '-' : '+') || toString(times_change_decimal) || 'x'
+            : '--' as times_change_str
     select changed_fail, unstable_fail,
-        toDecimal64(left, 3), toDecimal64(right, 3),
-        left > right
-            ? '- ' || toString(toDecimal64(left / (right + 0.001), 3)) || 'x'
-            : '+ ' || toString(toDecimal64(right / (left + 0.001), 3)) || 'x',
+        toDecimal64(left, 3), toDecimal64(right, 3), times_change_str,
         toDecimal64(isFinite(diff) ? diff : 0, 3),
         toDecimal64(isFinite(stat_threshold) ? stat_threshold : 0, 3),
         test, query_index, query_display_name