diff --git a/panels/dev-state/ha-panel-dev-state.html b/panels/dev-state/ha-panel-dev-state.html
index c97f03b474..5ec0f98928 100644
--- a/panels/dev-state/ha-panel-dev-state.html
+++ b/panels/dev-state/ha-panel-dev-state.html
@@ -149,8 +149,10 @@ Polymer({
 
   handleSetState: function () {
     var attr;
+    var attrRaw = this._stateAttributes.replace(/^\s+|\s+$/g, '')
     try {
-      attr = this._stateAttributes ? JSON.parse(this._stateAttributes) : {};
+      attr = attrRaw ?
+        JSON.parse(attrRaw) : {};
     } catch (err) {
       /* eslint-disable no-alert */
       alert('Error parsing JSON: ' + err);