diff --git a/web/html/xui/index.html b/web/html/xui/index.html
index c6c3279a..4fff2a2e 100644
--- a/web/html/xui/index.html
+++ b/web/html/xui/index.html
@@ -302,7 +302,7 @@
                 </a-button>
             </a-form-item>
        </a-form>
-        <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto;" v-html="logModal.logs"></div>
+        <div class="ant-input" style="height: auto; max-height: 500px; overflow: auto;" v-html="logModal.formattedLogs"></div>
     </a-modal>
 
     <a-modal id="backup-modal" v-model="backupModal.visible" :title="backupModal.title"
@@ -435,7 +435,7 @@
         loading: false,
         show(logs) {
             this.visible = true;
-            this.logs = logs || []; 
+            this.logs = logs; 
             this.formattedLogs = this.logs.length > 0 ? this.formatLogs(this.logs) : "No Record...";
         },
         formatLogs(logs) {
diff --git a/xray/log_writer.go b/xray/log_writer.go
index 53358ca2..9b603d19 100644
--- a/xray/log_writer.go
+++ b/xray/log_writer.go
@@ -1,6 +1,7 @@
 package xray
 
 import (
+	"regexp"
 	"strings"
 	"x-ui/logger"
 )
@@ -14,26 +15,20 @@ type LogWriter struct {
 }
 
 func (lw *LogWriter) Write(m []byte) (n int, err error) {
+	regex := regexp.MustCompile(`^(\d{4}/\d{2}/\d{2} \d{2}:\d{2}:\d{2}) \[([^\]]+)\] (.+)$`)
+
 	// Convert the data to a string
 	message := strings.TrimSpace(string(m))
+
 	messages := strings.Split(message, "\n")
 	lw.lastLine = messages[len(messages)-1]
 
 	for _, msg := range messages {
-		messageBody := msg
+		matches := regex.FindStringSubmatch(msg)
 
-		// Remove timestamp
-		splittedMsg := strings.SplitN(msg, " ", 3)
-		if len(splittedMsg) > 2 {
-			messageBody = strings.TrimSpace(strings.SplitN(msg, " ", 3)[2])
-		}
-
-		// Find level in []
-		startIndex := strings.Index(messageBody, "[")
-		endIndex := strings.Index(messageBody, "]")
-		if startIndex != -1 && endIndex != -1 && startIndex < endIndex {
-			level := strings.TrimSpace(messageBody[startIndex+1 : endIndex])
-			msgBody := "XRAY: " + strings.TrimSpace(messageBody[endIndex+1:])
+		if len(matches) > 3 {
+			level := matches[2]
+			msgBody := matches[3]
 
 			// Map the level to the appropriate logger function
 			switch level {