diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb
index 85b8048..112b6d3 100644
--- a/app/controllers/spree/checkout_controller_decorator.rb
+++ b/app/controllers/spree/checkout_controller_decorator.rb
@@ -88,15 +88,11 @@ module Spree
                                                   # phone is currently blanked in AM's PPX response lib
                                                   :phone      => @ppx_details.params["phone"] || "(not given)"
 
-          state = Spree::State.find_by_abbr(ship_address["state"].upcase) if ship_address["state"].present?
-          if state
-            order_ship_address.state = state
-          else
-            order_ship_address.state_name = ship_address["state"]
-          end
+          # Do not guess the state as it might be a state from the wrong country
+          order_ship_address.state_name = ship_address["state"]
 
           # Paypal requires us to have a state for US and on some states it is empty
-          if order_ship_address.state_name.nil? && order_ship_address.state.nil?
+          if order_ship_address.state_name.nil? || order_ship_address.state_name.empty?
             order_ship_address.state_name = "N/A"
           end