diff --git a/application/src/main/java/org/thingsboard/server/service/ai/AiChatModelServiceImpl.java b/application/src/main/java/org/thingsboard/server/service/ai/AiChatModelServiceImpl.java
index c1829cbf84..639e2025fe 100644
--- a/application/src/main/java/org/thingsboard/server/service/ai/AiChatModelServiceImpl.java
+++ b/application/src/main/java/org/thingsboard/server/service/ai/AiChatModelServiceImpl.java
@@ -15,6 +15,7 @@
  */
 package org.thingsboard.server.service.ai;
 
+import com.fasterxml.jackson.core.io.JsonStringEncoder;
 import com.google.common.util.concurrent.FluentFuture;
 import dev.langchain4j.data.message.ChatMessage;
 import dev.langchain4j.data.message.Content;
@@ -32,8 +33,6 @@ import org.thingsboard.server.common.data.ai.model.chat.Langchain4jChatModelConf
 import java.util.List;
 import java.util.stream.Collectors;
 
-import static org.thingsboard.server.common.data.StringUtils.escapeControlChars;
-
 @Service
 @RequiredArgsConstructor
 class AiChatModelServiceImpl implements AiChatModelService {
@@ -74,7 +73,7 @@ class AiChatModelServiceImpl implements AiChatModelService {
 
     private Content prepareContent(Content content) {
         if (content instanceof TextContent txt) {
-            return new TextContent(escapeControlChars(txt.text()));
+            return new TextContent(new String(JsonStringEncoder.getInstance().quoteAsString(txt.text())));
         }
         return content;
     }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java b/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
index 2b8b631027..cbc881d72f 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/StringUtils.java
@@ -275,11 +275,4 @@ public class StringUtils {
         return result;
     }
 
-    public static String escapeControlChars(String text) {
-        return text
-                .replace("\n", "\\n")
-                .replace("\r", "\\r")
-                .replace("\t", "\\t");
-    }
-
 }