diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index de62818438..0981fd64af 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -166,7 +166,8 @@ cassandra:
     ts_key_value_partitioning: "${TS_KV_PARTITIONING:MONTHS}"
     ts_key_value_ttl: "${TS_KV_TTL:0}"
     events_ttl: "${TS_EVENTS_TTL:0}"
-    debug_events_ttl: "${DEBUG_EVENTS_TTL:WEEK}"
+    # Specify TTL of debug log in seconds. The current value corresponds to one week
+    debug_events_ttl: "${DEBUG_EVENTS_TTL:604800}"
     buffer_size: "${CASSANDRA_QUERY_BUFFER_SIZE:200000}"
     concurrent_limit: "${CASSANDRA_QUERY_CONCURRENT_LIMIT:1000}"
     permit_max_wait_time: "${PERMIT_MAX_WAIT_TIME:120000}"
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 2a55a02770..b2682ab2e2 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
@@ -71,7 +71,7 @@ public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao<EventE
     private int eventsTtl;
 
     @Value("${cassandra.query.debug_events_ttl}")
-    private String debugEventsTtl;
+    private int debugEventsTtl;
 
     @Override
     public Event save(TenantId tenantId, Event event) {
@@ -197,7 +197,7 @@ public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao<EventE
             insert = insert.ifNotExists();
         }
 
-        int selectedTtl = entity.getEventType().matches(DataConstants.DEBUG_RULE_NODE) ? toMillis(debugEventsTtl) : ttl;
+        int selectedTtl = entity.getEventType().equals(DataConstants.DEBUG_RULE_NODE) ? debugEventsTtl : ttl;
 
         if(selectedTtl > 0){
             insert.using(ttl(selectedTtl));
@@ -211,14 +211,4 @@ public class CassandraBaseEventDao extends CassandraAbstractSearchTimeDao<EventE
             }
         });
     }
-
-    private int toMillis(String timeInterval) {
-        switch (timeInterval) {
-            case "DAY":
-                return 24 * 3600;
-            case "WEEK":
-                return 7 * 24 * 3600;
-        }
-        return 0;
-    }
 }