diff --git a/src/panels/developer-tools/service/developer-tools-service.ts b/src/panels/developer-tools/service/developer-tools-service.ts
index d9c6c5a8a1..aba167cf5a 100644
--- a/src/panels/developer-tools/service/developer-tools-service.ts
+++ b/src/panels/developer-tools/service/developer-tools-service.ts
@@ -48,6 +48,11 @@ class HaPanelDevService extends LitElement {
         target: {},
         data: {},
       };
+      if (this._yamlMode) {
+        this.updateComplete.then(() =>
+          this._yamlEditor?.setValue(this._serviceData)
+        );
+      }
     } else if (!this._serviceData?.service) {
       const domain = Object.keys(this.hass.services).sort()[0];
       const service = Object.keys(this.hass.services[domain]).sort()[0];
@@ -56,6 +61,11 @@ class HaPanelDevService extends LitElement {
         target: {},
         data: {},
       };
+      if (this._yamlMode) {
+        this.updateComplete.then(() =>
+          this._yamlEditor?.setValue(this._serviceData)
+        );
+      }
     }
   }