diff --git a/salt/pcap/init.sls b/salt/pcap/init.sls
index a43f90288..b8580fd86 100644
--- a/salt/pcap/init.sls
+++ b/salt/pcap/init.sls
@@ -135,16 +135,17 @@ append_so-steno_so-status.conf:
     - text: so-steno
     - unless: grep -q so-steno /opt/so/conf/so-status/so-status.conf
 
-  {% if STENOOPTIONS.status == 'running' %}
-delete_so-steno_so-status.disabled:
-  file.uncomment:
-    - name: /opt/so/conf/so-status/so-status.conf
-    - regex: ^so-steno$
-  {% elif STENOOPTIONS.status == 'stopped' %}
+
+  {% if not STENOOPTIONS.start %}
 so-steno_so-status.disabled:
   file.comment:
     - name: /opt/so/conf/so-status/so-status.conf
     - regex: ^so-steno$
+  {% else %}
+delete_so-steno_so-status.disabled:
+  file.uncomment:
+    - name: /opt/so/conf/so-status/so-status.conf
+    - regex: ^so-steno$
   {% endif %}
 
 {% else %}
diff --git a/setup/so-functions b/setup/so-functions
index 6d7e5582a..da452516d 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1941,12 +1941,6 @@ sensor_pillar() {
 	if [ "$HNSENSOR" != 'inherit' ]; then
 		echo "  hnsensor: $HNSENSOR" >> "$pillar_file"
 	fi
-	if [[ $is_import ]]; then
-		printf '%s\n'\
-			"steno:"\
-			"  enabled: false" >> "$pillar_file"
-	fi
-
 }
 
 set_default_log_size() {