diff --git a/.idea/evibes.iml b/.idea/evibes.iml
index 7db85b5f..7f8677ff 100644
--- a/.idea/evibes.iml
+++ b/.idea/evibes.iml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module version="4">
   <component name="PyDocumentationSettings">
-    <option name="format" value="GOOGLE" />
-    <option name="myDocStringFormat" value="Google" />
+    <option name="format" value="PLAIN" />
+    <option name="myDocStringFormat" value="Plain" />
   </component>
   <component name="TemplatesService">
     <option name="TEMPLATE_CONFIGURATION" value="Django" />
diff --git a/core/models.py b/core/models.py
index 45c4c6e2..187e8464 100644
--- a/core/models.py
+++ b/core/models.py
@@ -1536,10 +1536,11 @@ class Order(ExportModelOperationsMixin("order"), NiceModel):  # type: ignore [mi
             raise Http404(_("promocode does not exist")) from dne
         return promocode.use(self)
 
-    def apply_addresses(
-        self, billing_address_uuid: str | None = None, shipping_address_uuid: str | None = None
-    ):
+    def apply_addresses(self, billing_address_uuid: str | None = None, shipping_address_uuid: str | None = None):
         try:
+            billing_address = Address.objects.none()
+            shipping_address = Address.objects.none()
+
             if not any([shipping_address_uuid, billing_address_uuid]) and not self.is_whole_digital:
                 raise ValueError(_("you can only buy physical products with shipping address specified"))
 
@@ -1586,7 +1587,8 @@ class Order(ExportModelOperationsMixin("order"), NiceModel):  # type: ignore [mi
         if (not force_balance and not force_payment) or (force_balance and force_payment):
             raise ValueError(_("invalid force value"))
 
-        order.apply_addresses(billing_address, shipping_address)
+        if any([billing_address, shipping_address]):
+            order.apply_addresses(billing_address, shipping_address)
 
         if order.total_quantity < 1:
             raise ValueError(_("you cannot purchase an empty order!"))