diff --git a/src/components/orgs/AddOrgModal.svelte b/src/components/orgs/AddOrgModal.svelte
index fa16e69f..6b3d8b68 100644
--- a/src/components/orgs/AddOrgModal.svelte
+++ b/src/components/orgs/AddOrgModal.svelte
@@ -52,9 +52,19 @@
         text: "Organization is being added...",
         duration: -1,
       }).showToast();
+      let address = {};
+      if (address_checked === true) {
+        address = {
+          address1: address_input1_value,
+          address2: address_input2_value || "",
+          postalcode: address_zipcode_value,
+          city: address_city_value,
+          country: "DE",
+        };
+      }
       RunnerOrganizationService.runnerOrganizationControllerPost({
         name,
-        address: undefined,
+        address: address,
         contact: undefined,
       })
         .then((result) => {