diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/event/CalculatedFieldDebugEventFilter.java b/common/data/src/main/java/org/thingsboard/server/common/data/event/CalculatedFieldDebugEventFilter.java
index 839583ef6c..b458d3dd03 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/event/CalculatedFieldDebugEventFilter.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/event/CalculatedFieldDebugEventFilter.java
@@ -25,8 +25,6 @@ import org.thingsboard.server.common.data.StringUtils;
 @Schema
 public class CalculatedFieldDebugEventFilter extends DebugEventFilter {
 
-    @Schema(description = "String value representing the calculated field id in the event body", example = "ccbfa2fe-c8f5-45d8-bb37-6b61a6e02833")
-    protected String calculatedFieldId;
     @Schema(description = "String value representing the entity id in the event body", example = "57b6bafe-d600-423c-9267-fe31e5218986")
     protected String entityId;
     @Schema(description = "String value representing the entity type", allowableValues = "DEVICE")
@@ -43,8 +41,7 @@ public class CalculatedFieldDebugEventFilter extends DebugEventFilter {
 
     @Override
     public boolean isNotEmpty() {
-        return super.isNotEmpty() || !StringUtils.isEmpty(calculatedFieldId) || !StringUtils.isEmpty(entityId)
-                || !StringUtils.isEmpty(entityType) || !StringUtils.isEmpty(msgId) || !StringUtils.isEmpty(msgType);
+        return super.isNotEmpty() || !StringUtils.isEmpty(entityId) || !StringUtils.isEmpty(entityType) || !StringUtils.isEmpty(msgId) || !StringUtils.isEmpty(msgType);
     }
 
 }
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/CalculatedFieldDebugEventRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/CalculatedFieldDebugEventRepository.java
index a759babcfb..dc6f6d7d58 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/CalculatedFieldDebugEventRepository.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/CalculatedFieldDebugEventRepository.java
@@ -80,7 +80,7 @@ public interface CalculatedFieldDebugEventRepository extends EventRepository<Cal
                                                      @Param("entityId") UUID entityId,
                                                      @Param("startTime") Long startTime,
                                                      @Param("endTime") Long endTime,
-                                                     @Param("serviceId") String server,
+                                                     @Param("serviceId") String serviceId,
                                                      @Param("calculatedFieldId") UUID calculatedFieldId,
                                                      @Param("eventEntityId") String eventEntityId,
                                                      @Param("eventEntityType") String eventEntityType,
@@ -123,7 +123,7 @@ public interface CalculatedFieldDebugEventRepository extends EventRepository<Cal
                       @Param("entityId") UUID entityId,
                       @Param("startTime") Long startTime,
                       @Param("endTime") Long endTime,
-                      @Param("serviceId") String server,
+                      @Param("serviceId") String serviceId,
                       @Param("calculatedFieldId") UUID calculatedFieldId,
                       @Param("eventEntityId") String eventEntityId,
                       @Param("eventEntityType") String eventEntityType,
diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
index e3c1b37536..e48210871a 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDao.java
@@ -294,7 +294,6 @@ public class JpaBaseEventDao implements EventDao {
     }
 
     private PageData<? extends Event> findEventByFilter(UUID tenantId, UUID entityId, CalculatedFieldDebugEventFilter eventFilter, TimePageLink pageLink) {
-        parseUUID(eventFilter.getCalculatedFieldId(), "Calculated Field Id");
         parseUUID(eventFilter.getEntityId(), "Entity Id");
         parseUUID(eventFilter.getMsgId(), "Message Id");
         return DaoUtil.toPageData(
@@ -304,7 +303,7 @@ public class JpaBaseEventDao implements EventDao {
                         pageLink.getStartTime(),
                         pageLink.getEndTime(),
                         eventFilter.getServer(),
-                        UUID.fromString(eventFilter.getCalculatedFieldId()),
+                        entityId,
                         eventFilter.getEntityId(),
                         eventFilter.getEntityType(),
                         eventFilter.getMsgId(),
@@ -389,7 +388,6 @@ public class JpaBaseEventDao implements EventDao {
     }
 
     private void removeEventsByFilter(UUID tenantId, UUID entityId, CalculatedFieldDebugEventFilter eventFilter, Long startTime, Long endTime) {
-        parseUUID(eventFilter.getCalculatedFieldId(), "Calculated Field Id");
         parseUUID(eventFilter.getEntityId(), "Entity Id");
         parseUUID(eventFilter.getMsgId(), "Message Id");
         calculatedFieldDebugEventRepository.removeEvents(
@@ -398,7 +396,7 @@ public class JpaBaseEventDao implements EventDao {
                 startTime,
                 endTime,
                 eventFilter.getServer(),
-                UUID.fromString(eventFilter.getCalculatedFieldId()),
+                entityId,
                 eventFilter.getEntityId(),
                 eventFilter.getEntityType(),
                 eventFilter.getMsgId(),