diff --git a/lib/server.js b/lib/server.js
index 7e0b22267..b2a0f4212 100644
--- a/lib/server.js
+++ b/lib/server.js
@@ -660,6 +660,11 @@ class WebServer {
             return; //already processed.
         }
 
+        //handle new format and convert to old:
+        if (data.target && data.target.entity_id) {
+            data.service_data.entity_id = data.service_data.entity_id || data.target.entity_id;
+        }
+
         let ids = [data.service_data.entity_id];
         if (data.service_data.entity_id instanceof Array) {
             ids = data.service_data.entity_id;