diff --git a/application/src/main/data/json/demo/dashboards/theromstats.json b/application/src/main/data/json/demo/dashboards/theromstats.json
index c7ab182171..92d5082031 100644
--- a/application/src/main/data/json/demo/dashboards/theromstats.json
+++ b/application/src/main/data/json/demo/dashboards/theromstats.json
@@ -1181,12 +1181,10 @@
         "id": "ce27a9d0-93bf-b7a4-054d-d0369a8cf813",
         "alias": "Thermostat-alarm",
         "filter": {
-          "type": "singleEntity",
-          "resolveMultiple": false,
-          "singleEntity": {
-            "entityType": "CURRENT_TENANT",
-            "id": null
-          }
+          "type": "entityName",
+          "resolveMultiple": true,
+          "entityType": "ASSET",
+          "entityNameFilter": "Thermostat Alarms"
         }
       }
     },
@@ -1225,4 +1223,4 @@
     }
   },
   "name": "Thermostats"
-}
+}
\ No newline at end of file
diff --git a/application/src/main/data/json/demo/rule_chains/thermostat_alarms.json b/application/src/main/data/json/demo/rule_chains/thermostat_alarms.json
index 9b7e3401d2..8fd10c88f1 100644
--- a/application/src/main/data/json/demo/rule_chains/thermostat_alarms.json
+++ b/application/src/main/data/json/demo/rule_chains/thermostat_alarms.json
@@ -24,7 +24,9 @@
           "severity": "MAJOR",
           "propagate": true,
           "useMessageAlarmData": false,
-          "relationTypes": []
+          "relationTypes": [
+            "ToAlarmPropagationAsset"
+          ]
         }
       },
       {
@@ -54,7 +56,9 @@
           "severity": "MINOR",
           "propagate": true,
           "useMessageAlarmData": false,
-          "relationTypes": []
+          "relationTypes": [
+            "ToAlarmPropagationAsset"
+          ]
         }
       },
       {
diff --git a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
index b8d5d26d06..3403cf56e2 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/DefaultSystemDataLoaderService.java
@@ -29,6 +29,7 @@ import org.thingsboard.server.common.data.DataConstants;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
+import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DeviceId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -36,14 +37,17 @@ import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
 import org.thingsboard.server.common.data.kv.BooleanDataEntry;
 import org.thingsboard.server.common.data.kv.DoubleDataEntry;
 import org.thingsboard.server.common.data.kv.LongDataEntry;
+import org.thingsboard.server.common.data.relation.EntityRelation;
 import org.thingsboard.server.common.data.security.Authority;
 import org.thingsboard.server.common.data.security.DeviceCredentials;
 import org.thingsboard.server.common.data.security.UserCredentials;
 import org.thingsboard.server.common.data.widget.WidgetsBundle;
+import org.thingsboard.server.dao.asset.AssetService;
 import org.thingsboard.server.dao.attributes.AttributesService;
 import org.thingsboard.server.dao.customer.CustomerService;
 import org.thingsboard.server.dao.device.DeviceCredentialsService;
 import org.thingsboard.server.dao.device.DeviceService;
+import org.thingsboard.server.dao.relation.RelationService;
 import org.thingsboard.server.dao.settings.AdminSettingsService;
 import org.thingsboard.server.dao.tenant.TenantService;
 import org.thingsboard.server.dao.user.UserService;
@@ -81,6 +85,12 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
     @Autowired
     private CustomerService customerService;
 
+    @Autowired
+    private RelationService relationService;
+
+    @Autowired
+    private AssetService assetService;
+
     @Autowired
     private DeviceService deviceService;
 
@@ -163,9 +173,17 @@ public class DefaultSystemDataLoaderService implements SystemDataLoaderService {
         createDevice(demoTenant.getId(), null, DEFAULT_DEVICE_TYPE, "Raspberry Pi Demo Device", "RASPBERRY_PI_DEMO_TOKEN", "Demo device that is used in " +
                 "Raspberry Pi GPIO control sample application");
 
+        Asset thermostatAlarms = new Asset();
+        thermostatAlarms.setName("Thermostat Alarms");
+        thermostatAlarms.setType("AlarmPropagationAsset");
+        thermostatAlarms = assetService.saveAsset(thermostatAlarms);
+
         DeviceId t1Id = createDevice(demoTenant.getId(), null, "thermostat", "Thermostat T1", "T1_TEST_TOKEN", "Demo device for Thermostats dashboard").getId();
         DeviceId t2Id = createDevice(demoTenant.getId(), null, "thermostat", "Thermostat T2", "T2_TEST_TOKEN", "Demo device for Thermostats dashboard").getId();
 
+        relationService.saveRelation(thermostatAlarms.getTenantId(), new EntityRelation(thermostatAlarms.getId(), t1Id, "ToAlarmPropagationAsset"));
+        relationService.saveRelation(thermostatAlarms.getTenantId(), new EntityRelation(thermostatAlarms.getId(), t2Id, "ToAlarmPropagationAsset"));
+
         attributesService.save(demoTenant.getId(), t1Id, DataConstants.SERVER_SCOPE,
                 Arrays.asList(new BaseAttributeKvEntry(System.currentTimeMillis(), new DoubleDataEntry("latitude", 37.3948)),
                         new BaseAttributeKvEntry(System.currentTimeMillis(), new DoubleDataEntry("longitude", -122.1503)),