diff --git a/bemani/backend/bishi/bishi.py b/bemani/backend/bishi/bishi.py
index 632412c..c9856f9 100644
--- a/bemani/backend/bishi/bishi.py
+++ b/bemani/backend/bishi/bishi.py
@@ -85,6 +85,8 @@ class TheStarBishiBashi(
     def __escape_string(self, data: Union[int, str]) -> str:
         data = str(data)
         data = data.replace("#", "##")
+        data = data.replace("\r\n", "#n")
+        data = data.replace("\r", "#n")
         data = data.replace("\n", "#n")
         data = data.replace(" ", "#s")
         data = data.replace(",", "#,")