diff --git a/osu.Game/Online/API/Requests/Responses/Comment.cs b/osu.Game/Online/API/Requests/Responses/Comment.cs
index 30aca3c2ea..fb0aad0e0b 100644
--- a/osu.Game/Online/API/Requests/Responses/Comment.cs
+++ b/osu.Game/Online/API/Requests/Responses/Comment.cs
@@ -87,8 +87,7 @@ namespace osu.Game.Online.API.Requests.Responses
 
         public string GetMessage()
         {
-            //temporary fix until HTML parsing will be implemented
-            return MessageHTML.Remove(MessageHTML.LastIndexOf("</p>")).Substring(65);
+            return MessageHTML.Replace("<div class='osu-md-default'>", "").Replace("<p class=\"osu-md-default__paragraph\">", "").Replace("<br />", "").Replace("</p>", "").Replace("</div>", "");
         }
     }
 }