diff --git a/salt/influxdb/init.sls b/salt/influxdb/init.sls
index c6120d292..3a309db47 100644
--- a/salt/influxdb/init.sls
+++ b/salt/influxdb/init.sls
@@ -2,6 +2,9 @@
 {% if sls in allowed_states %}
 
 {% set GRAFANA = salt['pillar.get']('manager:grafana', '0') %}
+
+{% if grains['role'] in ['so-manager', 'so-managersearch', 'so-eval', 'so-standalone'] and GRAFANA == 1 %}
+
 {% set MANAGER = salt['grains.get']('master') %}
 {% set VERSION = salt['pillar.get']('global:soversion', 'HH1.2.2') %}
 {% set IMAGEREPO = salt['pillar.get']('global:imagerepo') %}
@@ -9,9 +12,7 @@
 {% set influxdb = salt['grains.filter_by'](default_settings, default='influxdb', merge=salt['pillar.get']('influxdb', {})) %}
 {% from 'salt/map.jinja' import PYTHON3INFLUX with context %}
 {% from 'salt/map.jinja' import  PYTHONINFLUXVERSION with context %}
-{% set PYTHONINFLUXVERSIONINSTALLED = salt['cmd.run']("python3 -c 'import influxdb; print (influxdb.__version__)'", python_shell=True) %}
-
-{% if grains['role'] in ['so-manager', 'so-managersearch', 'so-eval', 'so-standalone'] and GRAFANA == 1 %}
+{% set PYTHONINFLUXVERSIONINSTALLED = salt['cmd.run']("python3 -c \"exec('try:import influxdb; print (influxdb.__version__)\\nexcept:print(\\'Module Not Found\\')')\"", python_shell=True) %}
 
 include:
   - salt.minion
diff --git a/setup/so-setup b/setup/so-setup
index 1d8eba9ed..4573da330 100755
--- a/setup/so-setup
+++ b/setup/so-setup
@@ -837,6 +837,13 @@ echo "1" > /root/accept_changes
 			set_progress_str 73 "Update playbook rules"
 			so-playbook-ruleupdate >> /root/setup_playbook_rule_update.log 2>&1 &
 		fi
+
+		if [[ "$GRAFANA" = 1 ]]; then
+			set_progress_str 74 "Installing InfluxDB and Grafana"
+			salt-call state.apply -l info influxdb >> $setup_log 2>&1
+			salt-call state.apply -l info grafana >> $setup_log 2>&1
+		fi
+
 	fi
 	
 	if [[ "$OSQUERY" = 1 ]]; then