diff --git a/salt/sensoroni/files/sensoroni.json b/salt/sensoroni/files/sensoroni.json
index 1a6e6fc8c..743021a7d 100644
--- a/salt/sensoroni/files/sensoroni.json
+++ b/salt/sensoroni/files/sensoroni.json
@@ -17,7 +17,7 @@
   "agent": {
     "nodeId": "{{ grains.host | lower }}",
     "role": "{{ grains.role }}",
-    "description": "{{ DESCRIPTION }}",
+    "description": {{ DESCRIPTION | tojson }},
     "address": "{{ ADDRESS }}",
     "model": "{{ MODEL }}",
     "pollIntervalMs": {{ CHECKININTERVALMS if CHECKININTERVALMS else 10000 }},
diff --git a/setup/so-functions b/setup/so-functions
index 58fbca562..62d458911 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -1509,7 +1509,7 @@ host_pillar() {
 		"  mainint: '$MNIC'"\
 		"sensoroni:"\
 		"  node_address: '$MAINIP'"\
-		"  node_description: '$NODE_DESCRIPTION'"\
+		"  node_description: '${NODE_DESCRIPTION//\'/''}'"\
 		"" > "$pillar_file"
 }