diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0500dc4c3..d7aa43e3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@
 - Correct order of numbers in trend diagram table (first relative, then absolute)
 - Update number formatting in statistics table when switching language
 - Disable Trend diagram and Map buttons while waiting for statistics search to finish [#346](https://github.com/spraakbanken/korp-frontend/issues/346)
+- Error when clicking trend diagram with multiple series [#358](https://github.com/spraakbanken/korp-frontend/issues/358)
 - Strip HTML from total hits in annotated KWIC dowload
 - Fix dynamic translation for tabs etc
 - Modes in "More" menu sorted locale-awarely
diff --git a/app/config/statistics_config.js b/app/config/statistics_config.js
index e1e8485e1..f010db661 100644
--- a/app/config/statistics_config.js
+++ b/app/config/statistics_config.js
@@ -24,7 +24,7 @@ export function getCqp(hitValues, ignoreCase) {
         }
         tokens.push("[" + andExpr.join(" & ") + "]")
     }
-    return `<match> ${tokens.join(" ")} []* </match>`
+    return `<match> ${tokens.join(" ")} []{0,} </match>`
 }
 
 function reduceCqp(type, tokens, ignoreCase) {
diff --git a/app/scripts/trend_diagram/trend_util.js b/app/scripts/trend_diagram/trend_util.js
index b2b8bffd7..b542af7f5 100644
--- a/app/scripts/trend_diagram/trend_util.js
+++ b/app/scripts/trend_diagram/trend_util.js
@@ -27,7 +27,7 @@ export function getTimeCQP(time, zoom, coarseGranularity) {
         timecqp = `[(${startsSameDate} & ${timeInside}) | (${startsBefore} & ${endsAfter})]`
     }
 
-    timecqp = `<match> ${timecqp} []* </match>`
+    timecqp = `<match> ${timecqp} []{0,} </match>`
     return timecqp
 }