diff --git a/osu.Game/Online/API/Requests/Responses/Comment.cs b/osu.Game/Online/API/Requests/Responses/Comment.cs
index 68a4c28726..29abaa74e5 100644
--- a/osu.Game/Online/API/Requests/Responses/Comment.cs
+++ b/osu.Game/Online/API/Requests/Responses/Comment.cs
@@ -70,13 +70,9 @@ namespace osu.Game.Online.API.Requests.Responses
 
         public bool IsDeleted => DeletedAt.HasValue;
 
-        public string GetMessage()
-        {
-            if (IsDeleted)
-                return @"deleted";
+        public bool HasMessage => !string.IsNullOrEmpty(MessageHtml);
 
-            return WebUtility.HtmlDecode(Regex.Replace(MessageHtml, @"<(.|\n)*?>", string.Empty));
-        }
+        public string GetMessage => HasMessage ? WebUtility.HtmlDecode(Regex.Replace(MessageHtml, @"<(.|\n)*?>", string.Empty)) : string.Empty;
 
         public int DeletedChildrenCount => ChildComments.Count(c => c.IsDeleted);
     }
diff --git a/osu.Game/Overlays/Comments/DrawableComment.cs b/osu.Game/Overlays/Comments/DrawableComment.cs
index 59d3d08122..89abda92cf 100644
--- a/osu.Game/Overlays/Comments/DrawableComment.cs
+++ b/osu.Game/Overlays/Comments/DrawableComment.cs
@@ -198,12 +198,13 @@ namespace osu.Game.Overlays.Comments
                 });
             }
 
-            if (!comment.IsDeleted)
+            if (comment.HasMessage)
             {
-                var formattedSource = MessageFormatter.FormatText(comment.GetMessage());
+                var formattedSource = MessageFormatter.FormatText(comment.GetMessage);
                 message.AddLinks(formattedSource.Text, formattedSource.Links);
             }
-            else
+
+            if (comment.IsDeleted)
             {
                 content.FadeColour(OsuColour.Gray(0.5f));
                 votePill.Hide();
@@ -297,13 +298,13 @@ namespace osu.Game.Overlays.Comments
 
         private class ParentUsername : FillFlowContainer, IHasTooltip
         {
-            public string TooltipText => comment.ParentComment?.GetMessage() ?? "";
+            public string TooltipText => getParentMessage();
 
-            private readonly Comment comment;
+            private readonly Comment parentComment;
 
             public ParentUsername(Comment comment)
             {
-                this.comment = comment;
+                parentComment = comment.ParentComment;
 
                 AutoSizeAxes = Axes.Both;
                 Direction = FillDirection.Horizontal;
@@ -319,10 +320,18 @@ namespace osu.Game.Overlays.Comments
                     new SpriteText
                     {
                         Font = OsuFont.GetFont(size: 14, weight: FontWeight.Bold, italics: true),
-                        Text = comment.ParentComment?.User?.Username ?? comment.ParentComment?.LegacyName
+                        Text = parentComment?.User?.Username ?? parentComment?.LegacyName
                     }
                 };
             }
+
+            private string getParentMessage()
+            {
+                if (parentComment == null)
+                    return string.Empty;
+
+                return parentComment.HasMessage ? parentComment.GetMessage : parentComment.IsDeleted ? @"deleted" : string.Empty;
+            }
         }
 
         private class VotePill : CircularContainer