diff --git a/salt/soc/files/soc/soc.json b/salt/soc/files/soc/soc.json
index d0769ca33..9d5fa178d 100644
--- a/salt/soc/files/soc/soc.json
+++ b/salt/soc/files/soc/soc.json
@@ -28,15 +28,17 @@
         "password": "",
         "verifyCert": false
       },
-      "statickeyauth": {
-        "anonymousCidr": "172.17.0.0/24",
-        "apiKey": "{{ SENSORONIKEY }}"
-      },
+{% if THEHIVEKEY != '' %}
       "thehive": {
         "hostUrl": "http://{{ MANAGERIP }}:9000/thehive",
         "key": "{{ THEHIVEKEY }}",
         "verifyCert": false
-      }        
+      }
+{% endif %}
+      "statickeyauth": {
+        "anonymousCidr": "172.17.0.0/24",
+        "apiKey": "{{ SENSORONIKEY }}"
+      }
     },
     "client": {
       "hunt": {
@@ -49,7 +51,7 @@
         "relativeTimeUnit": 30,
         "mostRecentlyUsedLimit": 5,
         "dismissEnabled": false,
-        "escalateEnabled": true,        
+        "escalateEnabled": {{ 'true' if THEHIVEKEY != '' else 'false' }},
         "eventFields": {{ hunt_eventfields | json }},
         "queryBaseFilter": "",
         "queryToggleFilters": [],
@@ -66,7 +68,7 @@
         "relativeTimeUnit": 30,
         "mostRecentlyUsedLimit": 5,
         "dismissEnabled": true,
-        "escalateEnabled": true,        
+        "escalateEnabled": {{ 'true' if THEHIVEKEY != '' else 'false' }},
         "eventFields": {{ alerts_eventfields | json }},
         "queryBaseFilter": "event.dataset:alert",
         "queryToggleFilters": [