diff --git a/panels/dev-state/ha-panel-dev-state.html b/panels/dev-state/ha-panel-dev-state.html
index 59870fce18..43b90334ee 100644
--- a/panels/dev-state/ha-panel-dev-state.html
+++ b/panels/dev-state/ha-panel-dev-state.html
@@ -188,10 +188,15 @@ Polymer({
     var i;
     var keys;
     var key;
+    var value;
 
     for (i = 0, keys = Object.keys(entity.attributes); i < keys.length; i++) {
       key = keys[i];
-      output += key + ': ' + entity.attributes[key] + '\n';
+      value = entity.attributes[key];
+      if (!Array.isArray(value) && (value instanceof Object)) {
+        value = JSON.stringify(value, null, '  ');
+      }
+      output += key + ': ' + value + '\n';
     }
 
     return output;