diff --git a/press/press/doctype/invoice/invoice.py b/press/press/doctype/invoice/invoice.py
index 3cf5d907a2..ecdd1b6874 100644
--- a/press/press/doctype/invoice/invoice.py
+++ b/press/press/doctype/invoice/invoice.py
@@ -276,6 +276,8 @@ def finalize_invoice(self):
 					)
 				)
 
+		self.save()
+
 		if self.amount_due > 0:
 			if self.payment_mode == "Prepaid Credits":
 				self.add_comment(
@@ -287,8 +289,6 @@ def finalize_invoice(self):
 			if self.payment_mode == "Card":
 				self.create_stripe_invoice()
 
-		self.save()
-
 		if self.status == "Paid":
 			self.submit()
 			self.unsuspend_sites_if_applicable()
@@ -385,6 +385,7 @@ def create_stripe_invoice(self):
 				)
 				self.stripe_invoice_id = ""
 				self.stripe_invoice_url = ""
+				self.save()
 
 		if self.amount_due_with_tax <= 0:
 			return