diff --git a/lib/spree/money.rb b/lib/spree/money.rb
index 7ac0bd2722..994aceabb7 100644
--- a/lib/spree/money.rb
+++ b/lib/spree/money.rb
@@ -28,13 +28,7 @@ module Spree
     end
 
     def to_html(options = { html_wrap: true })
-      output = @money.format(@options.merge(options))
-      if options[:html_wrap]
-        # 1) prevent blank, breaking spaces
-        # 2) prevent escaping of HTML character entities
-        output = output.sub(" ", " ").html_safe
-      end
-      output
+      @money.format(@options.merge(options)).html_safe
     end
 
     def format(options = {})
diff --git a/spec/lib/spree/money_spec.rb b/spec/lib/spree/money_spec.rb
index e1ab7663af..676572eff6 100644
--- a/spec/lib/spree/money_spec.rb
+++ b/spec/lib/spree/money_spec.rb
@@ -123,7 +123,7 @@ describe Spree::Money do
       money = Spree::Money.new(10)
       # The HTMLified version of the euro sign
       expect(money.to_html).to eq(
-        "<span&nbsp;class=\"money-whole\">10</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span> <span class=\"money-currency-symbol\">&#x20AC;</span>"
+        "<span class=\"money-whole\">10</span><span class=\"money-decimal-mark\">.</span><span class=\"money-decimal\">00</span> <span class=\"money-currency-symbol\">&#x20AC;</span>"
       )
     end
     # rubocop:enable Layout/LineLength