diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb
index 46ee3bc..e1444d4 100644
--- a/app/controllers/spree/checkout_controller_decorator.rb
+++ b/app/controllers/spree/checkout_controller_decorator.rb
@@ -94,6 +94,12 @@ module Spree
           else
             order_ship_address.state_name = ship_address["state"]
           end
+
+          # 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?
+            order_ship_address.state_name = "N/A"
+          end
+
           order_ship_address.save!
 
           @order.sysmocom_paypal_ship_address = order_ship_address