diff --git a/Layout/default/Address/Form.php b/Layout/default/Address/Form.php
index 392b8550c..dca5d177d 100644
--- a/Layout/default/Address/Form.php
+++ b/Layout/default/Address/Form.php
@@ -194,7 +194,7 @@
                     <div class="col-lg-10">
                       <select class="form-control" name="billing_delivery" id="billing_delivery">
                         <option value="email" <?=($address->billing_delivery == "email") ? "selected='selected'" : ""?>>Email</option>
-                        <option value="paper" <?=($address->billing_delivery == "paper") ? "selected='selected'" : ""?>>Post</option>
+                        <option value="paper" <?=($address->billing_delivery == "paper" || !$address->billing_delivery) ? "selected='selected'" : ""?>>Post</option>
                       </select>
                     </div>
                   </div>