diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb
index e1444d4..85b8048 100644
--- a/app/controllers/spree/checkout_controller_decorator.rb
+++ b/app/controllers/spree/checkout_controller_decorator.rb
@@ -100,6 +100,11 @@ module Spree
             order_ship_address.state_name = "N/A"
           end
 
+          # Paypal returned an address without zipcode
+          if order_ship_address.zipcode.nil?
+            order_ship_address.zipcode = "N/A"
+          end
+
           order_ship_address.save!
 
           @order.sysmocom_paypal_ship_address = order_ship_address