diff --git a/netbox/templates/circuits/circuit.html b/netbox/templates/circuits/circuit.html
index 51f80cca5..4d7fe9fe2 100644
--- a/netbox/templates/circuits/circuit.html
+++ b/netbox/templates/circuits/circuit.html
@@ -119,7 +119,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if circuit.comments %}
-                    {{ circuit.comments|markdown }}
+                    {{ circuit.comments|render_markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/circuits/provider.html b/netbox/templates/circuits/provider.html
index dad07bc7c..faeb516ee 100644
--- a/netbox/templates/circuits/provider.html
+++ b/netbox/templates/circuits/provider.html
@@ -88,11 +88,11 @@
                 </tr>
                 <tr>
                     <td>NOC Contact</td>
-                    <td class="rendered-markdown">{{ provider.noc_contact|markdown|placeholder }}</td>
+                    <td class="rendered-markdown">{{ provider.noc_contact|render_markdown|placeholder }}</td>
                 </tr>
                 <tr>
                     <td>Admin Contact</td>
-                    <td class="rendered-markdown">{{ provider.admin_contact|markdown|placeholder }}</td>
+                    <td class="rendered-markdown">{{ provider.admin_contact|render_markdown|placeholder }}</td>
                 </tr>
                 <tr>
                     <td>Circuits</td>
@@ -110,7 +110,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if provider.comments %}
-                    {{ provider.comments|markdown }}
+                    {{ provider.comments|render_markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/dcim/device.html b/netbox/templates/dcim/device.html
index 9e16f6e6c..c657e9fc5 100644
--- a/netbox/templates/dcim/device.html
+++ b/netbox/templates/dcim/device.html
@@ -325,7 +325,7 @@
                 </div>
                 <div class="panel-body rendered-markdown">
                     {% if device.comments %}
-                        {{ device.comments|markdown }}
+                        {{ device.comments|render_markdown }}
                     {% else %}
                         <span class="text-muted">None</span>
                     {% endif %}
diff --git a/netbox/templates/dcim/devicetype.html b/netbox/templates/dcim/devicetype.html
index 27c61de76..352141a9a 100644
--- a/netbox/templates/dcim/devicetype.html
+++ b/netbox/templates/dcim/devicetype.html
@@ -149,7 +149,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if devicetype.comments %}
-                    {{ devicetype.comments|markdown }}
+                    {{ devicetype.comments|render_markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/dcim/powerfeed.html b/netbox/templates/dcim/powerfeed.html
index 350d9bd52..ca717b5e1 100644
--- a/netbox/templates/dcim/powerfeed.html
+++ b/netbox/templates/dcim/powerfeed.html
@@ -158,7 +158,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if powerfeed.comments %}
-                    {{ powerfeed.comments|markdown }}
+                    {{ powerfeed.comments|render_markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index a824f44de..99d9e4697 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -198,7 +198,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if rack.comments %}
-                    {{ rack.comments|markdown }}
+                    {{ rack.comments|render_markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/dcim/site.html b/netbox/templates/dcim/site.html
index ac7e1d07f..9f842bf10 100644
--- a/netbox/templates/dcim/site.html
+++ b/netbox/templates/dcim/site.html
@@ -206,7 +206,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if site.comments %}
-                    {{ site.comments|markdown }}
+                    {{ site.comments|render_markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/extras/script.html b/netbox/templates/extras/script.html
index bf83e7fd9..6d7aca126 100644
--- a/netbox/templates/extras/script.html
+++ b/netbox/templates/extras/script.html
@@ -47,7 +47,7 @@
                                     <tr>
                                         <td>{{ forloop.counter }}</td>
                                         <td>{% log_level level %}</td>
-                                        <td class="rendered-markdown">{{ message|markdown }}</td>
+                                        <td class="rendered-markdown">{{ message|render_markdown }}</td>
                                     </tr>
                                 {% empty %}
                                     <tr>
diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html
index f127d365a..64e5bbebd 100644
--- a/netbox/templates/extras/tag.html
+++ b/netbox/templates/extras/tag.html
@@ -90,7 +90,7 @@
                 </div>
                 <div class="panel-body rendered-markdown">
                     {% if tag.comments %}
-                        {{ tag.comments|markdown }}
+                        {{ tag.comments|render_markdown }}
                     {% else %}
                         <span class="text-muted">None</span>
                     {% endif %}
diff --git a/netbox/templates/tenancy/tenant.html b/netbox/templates/tenancy/tenant.html
index e5cea5705..4ef26c451 100644
--- a/netbox/templates/tenancy/tenant.html
+++ b/netbox/templates/tenancy/tenant.html
@@ -87,7 +87,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if tenant.comments %}
-                    {{ tenant.comments|markdown }}
+                    {{ tenant.comments|render_markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/virtualization/cluster.html b/netbox/templates/virtualization/cluster.html
index 0d2b1a968..4070977bc 100644
--- a/netbox/templates/virtualization/cluster.html
+++ b/netbox/templates/virtualization/cluster.html
@@ -115,7 +115,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if cluster.comments %}
-                    {{ cluster.comments|markdown }}
+                    {{ cluster.comments|render_markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index b5339f508..33dd8130a 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -152,7 +152,7 @@
             </div>
             <div class="panel-body rendered-markdown">
                 {% if virtualmachine.comments %}
-                    {{ virtualmachine.comments|markdown }}
+                    {{ virtualmachine.comments|render_markdown }}
                 {% else %}
                     <span class="text-muted">None</span>
                 {% endif %}