diff --git a/app/views/checkout/_details.html.haml b/app/views/checkout/_details.html.haml
index b3df2c94b2..56146d19c0 100644
--- a/app/views/checkout/_details.html.haml
+++ b/app/views/checkout/_details.html.haml
@@ -95,7 +95,7 @@
%div.checkout-input{"data-shippingmethod-target": "shippingMethodDescription", "data-shippingmethodid": shipping_method.id , style: "display: #{ship_method_is_selected ? 'block' : 'none'}" }
#distributor_address.panel
- if shipping_method.description.present?
- %span #{shipping_method.description}
+ = simple_format(html_escape(shipping_method.description))
= f.error_message_on :shipping_method, standalone: true
diff --git a/app/views/checkout/_payment.html.haml b/app/views/checkout/_payment.html.haml
index 656a246efe..516d2025bb 100644
--- a/app/views/checkout/_payment.html.haml
+++ b/app/views/checkout/_payment.html.haml
@@ -29,7 +29,7 @@
.paymentmethod-container{"data-paymentmethod-id": "#{payment_method.id}", style: "display: #{payment_method.id == selected_payment_method ? "block" : "none"}"}
- if payment_method.description && !payment_method.description.empty?
.paymentmethod-description.panel
- #{payment_method.description}
+ = simple_format(html_escape(payment_method.description))
.paymentmethod-form
= render partial: "checkout/payment/#{payment_method.method_type}", locals: { payment_method: payment_method, f: f }