diff --git a/server/handler/admin_comment_edit.go b/server/handler/admin_comment_edit.go
index 06876a6d4..6beb647ab 100644
--- a/server/handler/admin_comment_edit.go
+++ b/server/handler/admin_comment_edit.go
@@ -123,8 +123,13 @@ func AdminCommentEdit(router fiber.Router) {
 			comment.PageKey = p.PageKey
 		}
 
-		comment.UA = p.UA
-		comment.IP = p.IP
+		if p.UA != "" {
+			comment.UA = p.UA
+		}
+		if p.IP != "" {
+			comment.IP = p.IP
+		}
+
 		comment.IsCollapsed = p.IsCollapsed
 		comment.IsPinned = p.IsPinned