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 44f2b7efe6..f404edb8b1 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
@@ -759,26 +759,14 @@ public class SqlDatabaseUpgradeService implements DatabaseEntitiesUpgradeService
                 updateSchema("3.6.0", 3006000, "3.6.1", 3006001, null);
                 break;
             case "3.6.1":
-                updateSchema("3.6.1", 3006001, "3.6.2", 3006002, null);
-                break;
-            case "3.6.1":
-                try (Connection conn = DriverManager.getConnection(dbUrl, dbUserName, dbPassword)) {
-                    if (isOldSchema(conn, 3006001)) {
-                        log.info("Updating schema ...");
-                        try {
-                            Path saveAttributesNodeUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.6.1", "save_attributes_node_update.sql");
-                            loadSql(saveAttributesNodeUpdateFile, conn);
-                        } catch (Exception e) {
-                            log.warn("Failed to execute update script for save attributes rule nodes due to: ", e);
-                        }
-                        conn.createStatement().execute("UPDATE tb_schema_settings SET schema_version = 3006002;");
-                        log.info("Schema updated to version 3.6.2.");
-                    } else {
-                        log.info("Skip schema re-update to version 3.6.2. Use env flag 'SKIP_SCHEMA_VERSION_CHECK' to force the re-update.");
+                updateSchema("3.6.1", 3006001, "3.6.2", 3006002, connection -> {
+                    try {
+                        Path saveAttributesNodeUpdateFile = Paths.get(installScripts.getDataDir(), "upgrade", "3.6.1", "save_attributes_node_update.sql");
+                        loadSql(saveAttributesNodeUpdateFile, connection);
+                    } catch (Exception e) {
+                        log.warn("Failed to execute update script for save attributes rule nodes due to: ", e);
                     }
-                } catch (Exception e) {
-                    log.error("Failed updating schema!!!", e);
-                }
+                });
                 break;
             default:
                 throw new RuntimeException("Unable to upgrade SQL database, unsupported fromVersion: " + fromVersion);