diff --git a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
index 34bb744596..b8c95400b2 100644
--- a/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
+++ b/src/Umbraco.Web.UI/Views/Partials/Grid/Editors/Rte.cshtml
@@ -2,8 +2,12 @@
 @using Umbraco.Web.Composing
 @using Umbraco.Web.Templates
 @{
-    var value = TemplateUtilities.ParseInternalLinks(Model.value.ToString(), Current.UmbracoContext.UrlProvider);
-    value = TemplateUtilities.ResolveUrlsFromTextString(value);
-    value = TemplateUtilities.ResolveMediaFromTextString(value);
+    var htmlLocalLinkParser = Current.Factory.GetInstance<HtmlLocalLinkParser>();
+    var htmlUrlParser = Current.Factory.GetInstance<HtmlUrlParser>();
+    var htmlImageSourceParser = Current.Factory.GetInstance<HtmlImageSourceParser>();
+
+    var value = htmlUrlParser.EnsureUrls(Model.value.ToString());
+    value = htmlImageSourceParser.EnsureImageSources(value);
+    value = htmlLocalLinkParser.EnsureInternalLinks(value);
 }
 @Html.Raw(value)