diff --git a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/delay/TbMsgDelayNode.java b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/delay/TbMsgDelayNode.java
index a336c2095f..a3e0f6becc 100644
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/delay/TbMsgDelayNode.java
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/delay/TbMsgDelayNode.java
@@ -156,6 +156,9 @@ public class TbMsgDelayNode implements TbNode {
                         ((ObjectNode) oldConfiguration).put(period, oldConfiguration.get(periodInSeconds).asText());
                     }
                     hasChanges = true;
+                } else if (oldConfiguration.has(periodInSeconds)) {
+                    ((ObjectNode) oldConfiguration).put(period, oldConfiguration.get(periodInSeconds).asText());
+                    hasChanges = true;
                 }
                 if (!oldConfiguration.has(period)) {
                     ((ObjectNode) oldConfiguration).put(period, "60");
diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/delay/TbMsgDelayNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/delay/TbMsgDelayNodeTest.java
index 06565465d9..70511b03b9 100644
--- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/delay/TbMsgDelayNodeTest.java
+++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/delay/TbMsgDelayNodeTest.java
@@ -235,7 +235,7 @@ public class TbMsgDelayNodeTest extends AbstractRuleNodeUpgradeTest {
 
     private static Stream<Arguments> givenFromVersionAndConfig_whenUpgrade_thenVerifyHasChangesAndConfig() {
         return Stream.of(
-                // config for version 1 with upgrade from version 0 (useMetadataPeriodInSecondsPatterns does not exist)
+                // config for version 1 with upgrade from version 0 (useMetadataPeriodInSecondsPatterns does not exist and periodInSeconds exists)
                 Arguments.of(0,
                         """
                                     {
@@ -245,6 +245,23 @@ public class TbMsgDelayNodeTest extends AbstractRuleNodeUpgradeTest {
                                     }
                                 """,
                         true,
+                        """
+                                    {
+                                        "period": "13",
+                                        "timeUnit": "SECONDS",
+                                        "maxPendingMsgs": 1000
+                                    }
+                                """
+                ),
+                // config for version 1 with upgrade from version 0 (useMetadataPeriodInSecondsPatterns and periodInSeconds do not exist)
+                Arguments.of(0,
+                        """
+                                    {
+                                        "maxPendingMsgs": 1000,
+                                        "periodInSecondsPattern": "17"
+                                    }
+                                """,
+                        true,
                         """
                                     {
                                         "period": "60",