diff --git a/qgepqwat2ili/utils/qgep_export_utils.py b/qgepqwat2ili/utils/qgep_export_utils.py
index 8b4f919e..1a50ec0d 100644
--- a/qgepqwat2ili/utils/qgep_export_utils.py
+++ b/qgepqwat2ili/utils/qgep_export_utils.py
@@ -165,7 +165,7 @@ def base_common(self, row, type_name):
             "t_id": self.get_tid(row),
         }
 
-        if self.current_basket is not None:
+        if self.current_basket is not None and type_name != "organisation":
             base["t_basket"] = self.current_basket.t_id
 
         return base
@@ -281,6 +281,10 @@ def export_organisation(self):
                 bemerkung=self.truncate(self.emptystr_to_null(row.remark), 80),
                 bezeichnung=self.null_to_emptystr(row.identifier),
             )
+
+            if self.current_basket is not None:
+                organisation.t_basket = self.current_basket.t_id
+
             self.abwasser_session.add(organisation)
             self.create_metaattributes(row)
             print(".", end="")