diff --git a/application/src/main/java/org/thingsboard/server/actors/calculatedField/AbstractCalculatedFieldActor.java b/application/src/main/java/org/thingsboard/server/actors/calculatedField/AbstractCalculatedFieldActor.java
index 9f82b536fd..29c7fe6587 100644
--- a/application/src/main/java/org/thingsboard/server/actors/calculatedField/AbstractCalculatedFieldActor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/calculatedField/AbstractCalculatedFieldActor.java
@@ -41,15 +41,7 @@ public abstract class AbstractCalculatedFieldActor extends ContextAwareActor {
                 return doProcessCfMsg(cfm);
             } catch (CalculatedFieldException cfe) {
                 if (DebugModeUtil.isDebugFailuresAvailable(cfe.getCtx().getCalculatedField())) {
-                    String message;
-                    if (cfe.getErrorMessage() != null) {
-                        message = cfe.getErrorMessage();
-                    } else if (cfe.getCause() != null) {
-                        message = cfe.getCause().getMessage();
-                    } else {
-                        message = "N/A";
-                    }
-                    systemContext.persistCalculatedFieldDebugEvent(tenantId, cfe.getCtx().getCfId(), cfe.getEventEntity(), cfe.getArguments(), cfe.getMsgId(), cfe.getMsgType(), null, message);
+                    systemContext.persistCalculatedFieldDebugError(cfe);
                 }
                 cause = cfe.getCause();
             } catch (Exception e) {