diff --git a/pillar/data/addtotab.sh b/pillar/data/addtotab.sh
index 0ad2fa041..8e5a166cc 100644
--- a/pillar/data/addtotab.sh
+++ b/pillar/data/addtotab.sh
@@ -57,8 +57,10 @@ if [ $TYPE == 'sensorstab' ]; then
 fi
 if [ $TYPE == 'evaltab' ]; then
   echo "    monint: $MONINT" >> $local_salt_dir/pillar/data/$TYPE.sls
-  salt-call state.apply grafana queue=True
-  salt-call state.apply utility queue=True
+  if [ -f $local_salt_dir/pillar/firewall/masterfw.sls ] ; then
+    salt-call state.apply grafana queue=True
+    salt-call state.apply utility queue=True
+  fi
 fi
 #if [ $TYPE == 'nodestab' ]; then
 #  echo "    nodetype: $NODETYPE" >> $local_salt_dir/pillar/data/$TYPE.sls