diff --git a/app/models/spree/order.rb b/app/models/spree/order.rb
index ae82ac9a49..254340295e 100644
--- a/app/models/spree/order.rb
+++ b/app/models/spree/order.rb
@@ -176,7 +176,7 @@ module Spree
     end
 
     def to_param
-      number.to_s.to_url.upcase
+      number.to_s.parameterize.upcase
     end
 
     def completed?
diff --git a/app/models/spree/shipment.rb b/app/models/spree/shipment.rb
index bf83aa35fb..d03f63b20d 100644
--- a/app/models/spree/shipment.rb
+++ b/app/models/spree/shipment.rb
@@ -70,7 +70,7 @@ module Spree
 
     def to_param
       generate_shipment_number unless number
-      number.to_s.to_url.upcase
+      number.parameterize.upcase
     end
 
     def backordered?