diff --git a/salt/common/tools/sbin/so-user b/salt/common/tools/sbin/so-user
index 877f245c8..9873764d9 100755
--- a/salt/common/tools/sbin/so-user
+++ b/salt/common/tools/sbin/so-user
@@ -211,8 +211,10 @@ function syncElastic() {
     echo "Database file does not exist yet, skipping users export"
   fi
 
-  echo "Applying elastic state..."
-  salt-call state.apply elasticsearch queue=True
+  if [[ -z "$SKIP_STATE_APPLY" ]]; then
+    echo "Applying elastic state..."
+    salt-call state.apply elasticsearch queue=True
+  fi
 }
 
 function syncAll() {
diff --git a/salt/manager/init.sls b/salt/manager/init.sls
index e6e9c433b..0b54fbc2f 100644
--- a/salt/manager/init.sls
+++ b/salt/manager/init.sls
@@ -119,6 +119,8 @@ elastic_curl_config_distributed:
 syncesusers:
   cmd.run:
     - name: so-user sync
+    - env:
+      - SKIP_STATE_APPLY: 'true'
     - creates:
       - /opt/so/saltstack/local/salt/elasticsearch/files/users
       - /opt/so/saltstack/local/salt/elasticsearch/files/users_roles
diff --git a/salt/reactor/kratos.sls b/salt/reactor/kratos.sls
deleted file mode 100644
index fb90cc164..000000000
--- a/salt/reactor/kratos.sls
+++ /dev/null
@@ -1,5 +0,0 @@
-so_user_sync:
-  local.cmd.run:
-    - tgt: {{ data['data']['id'] }}
-    - arg:
-      - /usr/sbin/so-user sync