diff --git a/app/views/shop/checkout/_form.html.haml b/app/views/shop/checkout/_form.html.haml
index fa1d16867c..e21c86a94e 100644
--- a/app/views/shop/checkout/_form.html.haml
+++ b/app/views/shop/checkout/_form.html.haml
@@ -38,7 +38,7 @@
 
       %fieldset#shipping
         %legend Shipping
-        - checked_id = @order.shipping_method_id || current_distributor.shipping_methods.first.id 
+        - checked_id = @order.shipping_method_id || current_distributor.shipping_methods.first.andand.id 
         - for ship_method, i in current_distributor.shipping_methods.uniq
           .row
             .large-12.columns