diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
index 45aa39e8f2..d8c0599993 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/DataConstants.java
@@ -20,7 +20,6 @@ package org.thingsboard.server.common.data;
  */
 public class DataConstants {
 
-    public static final String SYSTEM = "SYSTEM";
     public static final String TENANT = "TENANT";
     public static final String CUSTOMER = "CUSTOMER";
     public static final String DEVICE = "DEVICE";
@@ -40,9 +39,6 @@ public class DataConstants {
     public static final String DEBUG_RULE_NODE = "DEBUG_RULE_NODE";
     public static final String DEBUG_RULE_CHAIN = "DEBUG_RULE_CHAIN";
 
-    public static final String ONEWAY = "ONEWAY";
-    public static final String TWOWAY = "TWOWAY";
-
     public static final String IN = "IN";
     public static final String OUT = "OUT";
 
diff --git a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java
index b2682ab2e2..590050f974 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/event/CassandraBaseEventDao.java
@@ -70,7 +70,7 @@ public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao<EventE
     @Value("${cassandra.query.events_ttl:0}")
     private int eventsTtl;
 
-    @Value("${cassandra.query.debug_events_ttl}")
+    @Value("${cassandra.query.debug_events_ttl:604800}")
     private int debugEventsTtl;
 
     @Override
@@ -197,9 +197,10 @@ public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao<EventE
             insert = insert.ifNotExists();
         }
 
-        int selectedTtl = entity.getEventType().equals(DataConstants.DEBUG_RULE_NODE) ? debugEventsTtl : ttl;
+        int selectedTtl = (entity.getEventType().equals(DataConstants.DEBUG_RULE_NODE) ||
+                entity.getEventType().equals(DataConstants.DEBUG_RULE_CHAIN)) ? debugEventsTtl : ttl;
 
-        if(selectedTtl > 0){
+        if (selectedTtl > 0) {
             insert.using(ttl(selectedTtl));
         }
         ResultSetFuture resultSetFuture = executeAsyncWrite(tenantId, insert);