diff --git a/panels/dev-service/ha-panel-dev-service.html b/panels/dev-service/ha-panel-dev-service.html
index 9c13a94c4e..95d0d59a66 100644
--- a/panels/dev-service/ha-panel-dev-service.html
+++ b/panels/dev-service/ha-panel-dev-service.html
@@ -79,7 +79,7 @@
         data='{{service}}'>
       </app-localstorage-document>
       <app-localstorage-document
-        key='panel-dev-service-state-servicedata'
+        key='[[computeServicedataKey(domain, service)]]'
         data='{{serviceData}}'>
       </app-localstorage-document>
 
@@ -207,6 +207,13 @@ Polymer({
     return Object.keys(serviceDomains[domain]).sort();
   },
 
+  computeServicedataKey: function (domain, service) {
+    if (!domain || !service) {
+      return 'panel-dev-service-state-servicedata';
+    }
+    return 'panel-dev-service-state-servicedata.' + domain + '.' + service;
+  },
+
   domainChanged: function () {
     this.service = '';
     this.serviceData = '';