diff --git a/application/src/main/data/upgrade/3.0.1/schema_update_to_uuid.sql b/application/src/main/data/upgrade/3.0.1/schema_update_to_uuid.sql
index d3304a7ddd..f3b1b3f751 100644
--- a/application/src/main/data/upgrade/3.0.1/schema_update_to_uuid.sql
+++ b/application/src/main/data/upgrade/3.0.1/schema_update_to_uuid.sql
@@ -67,6 +67,7 @@ CREATE OR REPLACE PROCEDURE drop_all_idx()
 $$
 BEGIN
     DROP INDEX IF EXISTS idx_alarm_originator_alarm_type;
+    DROP INDEX IF EXISTS idx_alarm_originator_alarm_time;
     DROP INDEX IF EXISTS idx_event_type_entity_id;
     DROP INDEX IF EXISTS idx_relation_to_id;
     DROP INDEX IF EXISTS idx_relation_from_id;
@@ -84,6 +85,7 @@ CREATE OR REPLACE PROCEDURE create_all_idx()
 $$
 BEGIN
     CREATE INDEX IF NOT EXISTS idx_alarm_originator_alarm_type ON alarm(originator_id, type, start_ts DESC);
+    CREATE INDEX IF NOT EXISTS idx_alarm_originator_alarm_time ON alarm(originator_id, created_time DESC);
     CREATE INDEX IF NOT EXISTS idx_event_type_entity_id ON event(tenant_id, event_type, entity_type, entity_id);
     CREATE INDEX IF NOT EXISTS idx_relation_to_id ON relation(relation_type_group, to_type, to_id);
     CREATE INDEX IF NOT EXISTS idx_relation_from_id ON relation(relation_type_group, from_type, from_id);
diff --git a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
index 1a6e60b98f..9536b20fcf 100644
--- a/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
+++ b/application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
@@ -254,6 +254,14 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
 
                         conn.createStatement().execute("call drop_all_idx()");
 
+                        log.info("Updating alarm relations...");
+                        conn.createStatement().execute("DELETE from relation WHERE relation_type_group = 'ALARM' AND relation_type <> 'ALARM_ANY';");
+
+                        conn.createStatement().execute("UPDATE relation SET relation_type = 'ANY' WHERE relation_type_group = 'ALARM' AND relation_type = 'ALARM_ANY';");
+                        log.info("Alarm relations updated.");
+
+                        conn.createStatement().execute("VACUUM FULL relation");
+
                         for (String table : tables) {
                             log.info("Updating table {}.", table);
                             Statement statement = conn.createStatement();
@@ -278,12 +286,6 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                         conn.createStatement().execute("DROP PROCEDURE create_all_idx");
                         conn.createStatement().execute("DROP FUNCTION column_type_to_uuid");
 
-                        log.info("Updating alarm relations...");
-                        conn.createStatement().execute("DELETE from relation WHERE relation_type_group = 'ALARM' AND relation_type <> 'ALARM_ANY';");
-
-                        conn.createStatement().execute("UPDATE relation SET relation_type = 'ANY' WHERE relation_type_group = 'ALARM' AND relation_type = 'ALARM_ANY';");
-                        log.info("Alarm relations updated.");
-
                         conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 3001000;");
 
                         conn.createStatement().execute("VACUUM FULL");