diff --git a/salt/influxdb/defaults.yaml b/salt/influxdb/defaults.yaml
index 651722315..205c2ba67 100644
--- a/salt/influxdb/defaults.yaml
+++ b/salt/influxdb/defaults.yaml
@@ -1,3 +1,5 @@
+{% set measurements = salt['cmd.shell']('docker exec -t so-influxdb influx -format json -ssl -unsafeSsl -database telegraf -execute "show measurements" 2> /root/measurement_query.log | jq -r .results[0].series[0].values[]?[0] 2>> /root/measurement_query.log') %}
+
 influxdb:
   retention_policies:
     so_short_term:
@@ -11,7 +13,9 @@ influxdb:
   downsample:
     so_long_term:
       resolution: 5m
+{% if measurements|length > 0 %}
       measurements:
-{% for measurement in salt['cmd.shell']('docker exec -t so-influxdb influx -format json -ssl -unsafeSsl -database telegraf -execute "show measurements" | jq -r .results[0].series[0].values[][0]').splitlines() %}
+  {% for measurement in measurements.splitlines() %}
         - {{ measurement }}
-{% endfor %}
+  {% endfor %}
+{% endif %}
diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls
index fb84f8bc8..37ebe39a5 100644
--- a/salt/influxdb/init.sls
+++ b/salt/influxdb/init.sls
@@ -113,7 +113,7 @@ telegraf_database:
 {% endfor %}
 
 {% for dest_rp in influxdb.downsample.keys() %}
-  {% for measurement in influxdb.downsample[dest_rp].measurements %}
+  {% for measurement in influxdb.downsample[dest_rp].get('measurements', []) %}
 so_downsample_{{measurement}}_cq:
   influxdb_continuous_query.present:
     - name: so_downsample_{{measurement}}_cq