diff --git a/salt/common/init.sls b/salt/common/init.sls
index da781e0ef..e511308a7 100644
--- a/salt/common/init.sls
+++ b/salt/common/init.sls
@@ -4,9 +4,8 @@
 {% set role = grains.id.split('_') | last %}
 {% from 'elasticsearch/auth.map.jinja' import ELASTICAUTH with context %}
 
-include:
-  - cron.running
 {% if grains.role in ['so-eval', 'so-manager', 'so-standalone', 'so-managersearch', 'so-import'] %}
+include:
   - manager.elasticsearch # needed for elastic_curl_config state
 {% endif %}
 
diff --git a/salt/salt/enable_highstate.sls b/salt/salt/enable_highstate.sls
new file mode 100644
index 000000000..72e5c1410
--- /dev/null
+++ b/salt/salt/enable_highstate.sls
@@ -0,0 +1,7 @@
+enable_highstate:
+  module.run:
+    - state.enable:
+      - states:
+        - highstate
+    - unless: pgrep soup
+  
\ No newline at end of file
diff --git a/salt/top.sls b/salt/top.sls
index 4fd8c1fd3..513439255 100644
--- a/salt/top.sls
+++ b/salt/top.sls
@@ -19,6 +19,10 @@
 
 base:
 
+  '*':
+    - salt.enable_highstate
+    - cron.running
+
   'not G@saltversion:{{saltversion}}':
     - match: compound
     - salt.minion-state-apply-test