diff --git a/application/src/main/data/upgrade/3.6.2/schema_update.sql b/application/src/main/data/upgrade/3.6.2/schema_update.sql
index fd64136852..4e62209ea8 100644
--- a/application/src/main/data/upgrade/3.6.2/schema_update.sql
+++ b/application/src/main/data/upgrade/3.6.2/schema_update.sql
@@ -16,7 +16,8 @@
 
 -- RULE NODE INDEXES UPDATE START
 
+DROP INDEX IF EXISTS idx_rule_node_type;
 DROP INDEX IF EXISTS idx_rule_node_type_configuration_version;
-CREATE INDEX IF NOT EXISTS idx_rule_node_id_type_configuration_version ON rule_node(id, type, configuration_version);
+CREATE INDEX IF NOT EXISTS idx_rule_node_type_id_configuration_version ON rule_node(type, id, configuration_version);
 
 -- RULE NODE INDEXES UPDATE END
diff --git a/dao/src/main/resources/sql/schema-entities-idx.sql b/dao/src/main/resources/sql/schema-entities-idx.sql
index 10678509b4..6a95d9e346 100644
--- a/dao/src/main/resources/sql/schema-entities-idx.sql
+++ b/dao/src/main/resources/sql/schema-entities-idx.sql
@@ -91,9 +91,7 @@ CREATE INDEX IF NOT EXISTS idx_widgets_bundle_external_id ON widgets_bundle(tena
 
 CREATE INDEX IF NOT EXISTS idx_rule_node_external_id ON rule_node(rule_chain_id, external_id);
 
-CREATE INDEX IF NOT EXISTS idx_rule_node_type ON rule_node(type);
-
-CREATE INDEX IF NOT EXISTS idx_rule_node_id_type_configuration_version ON rule_node(id, type, configuration_version);
+CREATE INDEX IF NOT EXISTS idx_rule_node_type_id_configuration_version ON rule_node(type, id, configuration_version);
 
 CREATE INDEX IF NOT EXISTS idx_api_usage_state_entity_id ON api_usage_state(entity_id);