diff --git a/website_sale_payment_terms/models/sale.py b/website_sale_payment_terms/models/sale.py
index 2544aa0d..b75cf245 100644
--- a/website_sale_payment_terms/models/sale.py
+++ b/website_sale_payment_terms/models/sale.py
@@ -12,7 +12,7 @@ class SaleOrder(models.Model):
         today_string = fields.Date.to_string(fields.Date.today())
         for order in self:
             amount = order.amount_total
-            if order.payment_term_id:
+            if order.website_id and order.amount_total > order.website_id.payment_deposit_threshold and order.payment_term_id:
                 term_amount = [amt for date_string, amt in order.payment_term_id.compute(order.amount_total) if date_string == today_string]
                 term_amount = term_amount and term_amount[0] or 0.0
                 amount = term_amount if term_amount > order.amount_total_deposit else order.amount_total_deposit
diff --git a/website_sale_payment_terms/views/website_templates.xml b/website_sale_payment_terms/views/website_templates.xml
index b5b782b6..8863b001 100644
--- a/website_sale_payment_terms/views/website_templates.xml
+++ b/website_sale_payment_terms/views/website_templates.xml
@@ -4,7 +4,7 @@
     <!-- Payment terms list items for /shop/payment -->
     <template id="payment_term_items">
         <t t-set="partner_term" t-value="order.partner_id.property_payment_term_id"/>
-        <t t-set="selected_term" t-value="order.payment_term_id or partner_term"/>
+        <t t-set="selected_term" t-value="order.payment_term_id"/>
         <!-- Show current partners payment terms -->
         <t t-if="partner_term and partner_term not in website_terms">
             <li class="list-group-item">