diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index de68f418..bd940c5f 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -254,7 +254,7 @@ class PaymentOrderView(FormView):
                 )
             else:
                 billing_address_form = BillingAddressForm(
-                    instance=self.request.user.billing_addresses.first()
+                    instance=self.request.user.billing_addresses.order_by('-id').first()
                 )
             user = self.request.user
             if hasattr(user, 'stripecustomer'):
diff --git a/hosting/views.py b/hosting/views.py
index 4e0cb900..869f5d1c 100644
--- a/hosting/views.py
+++ b/hosting/views.py
@@ -626,7 +626,7 @@ class SettingsView(LoginRequiredMixin, FormView):
                     'user': self.request.user.id
                 })
                 billing_address_user_form = UserBillingAddressForm(
-                    instance=self.request.user.billing_addresses.first(),
+                    instance=self.request.user.billing_addresses.order_by('-id').first(),
                     data=billing_address_data)
                 billing_address = billing_address_user_form.save()
                 billing_address.stripe_tax_id = ''