diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb
index 9cb587c..4cd2564 100644
--- a/app/controllers/spree/checkout_controller_decorator.rb
+++ b/app/controllers/spree/checkout_controller_decorator.rb
@@ -89,7 +89,7 @@ module Spree
           order_ship_address.save!
 
           @order.ship_address = order_ship_address
-          @order.bill_address = order_ship_address unless @order.bill_address
+          @order.bill_address ||= order_ship_address
         end
         @order.save