diff --git a/.changeset/twelve-eyes-wink.md b/.changeset/twelve-eyes-wink.md
new file mode 100644
index 0000000..c2f4823
--- /dev/null
+++ b/.changeset/twelve-eyes-wink.md
@@ -0,0 +1,5 @@
+---
+"saleor-app-invoices": patch
+---
+
+Fixed address form not loading if not data was set before
diff --git a/apps/invoices/src/modules/app-configuration/schema-v2/app-config-schema.v2.ts b/apps/invoices/src/modules/app-configuration/schema-v2/app-config-schema.v2.ts
index 5678146..c54497c 100644
--- a/apps/invoices/src/modules/app-configuration/schema-v2/app-config-schema.v2.ts
+++ b/apps/invoices/src/modules/app-configuration/schema-v2/app-config-schema.v2.ts
@@ -4,14 +4,14 @@ export const AddressV2Schema = z.object({
   /**
    * min() to allow empty strings
    */
-  companyName: z.string().min(0),
-  cityArea: z.string().min(0),
-  countryArea: z.string().min(0),
-  streetAddress1: z.string().min(0),
-  streetAddress2: z.string().min(0),
-  postalCode: z.string().min(0),
-  city: z.string().min(0),
-  country: z.string().min(0),
+  companyName: z.string().optional(),
+  cityArea: z.string().optional(),
+  countryArea: z.string().optional(),
+  streetAddress1: z.string().optional(),
+  streetAddress2: z.string().optional(),
+  postalCode: z.string().optional(),
+  city: z.string().optional(),
+  country: z.string().optional(),
 });
 export const AppConfigV2Schema = z.object({
   channelsOverrides: z.record(AddressV2Schema),
diff --git a/apps/invoices/src/modules/app-configuration/ui/address-form.tsx b/apps/invoices/src/modules/app-configuration/ui/address-form.tsx
index 05b9838..647434b 100644
--- a/apps/invoices/src/modules/app-configuration/ui/address-form.tsx
+++ b/apps/invoices/src/modules/app-configuration/ui/address-form.tsx
@@ -181,7 +181,9 @@ export const ConnectedAddressForm = (props: Props) => {
     push("/configuration");
   }, [push]);
 
-  if (channelOverrideConfigQuery.isLoading || !addressData) {
+  console.log(addressData);
+
+  if (channelOverrideConfigQuery.isLoading) {
     return <Text color={"textNeutralSubdued"}>Loading</Text>;
   }
 
@@ -189,7 +191,7 @@ export const ConnectedAddressForm = (props: Props) => {
     <AddressForm
       onCancel={onCancelHandler}
       onSubmit={submitHandler}
-      address={channelOverrideConfigQuery.data[props.channelSlug]}
+      address={channelOverrideConfigQuery.data![props.channelSlug]}
       channelSlug={props.channelSlug}
     />
   );