diff --git a/doc/82-Changelog.md b/doc/82-Changelog.md
index 245a1077..79305bf0 100644
--- a/doc/82-Changelog.md
+++ b/doc/82-Changelog.md
@@ -15,6 +15,9 @@ next (will be 1.9.1)
 * FIX: DataList-backed fields failed to validate (#2475)
 * FIX: No Host list limit when adding a single service globally (#2481)
 
+### Configuration Baskets
+* FIX: failed to export Baskets with Service Sets (#2488)
+
 ### DB Schema
 * FIX: applying DB Schema migrations failed on PostgreSQL (#2482)
 
diff --git a/library/Director/Objects/IcingaServiceSet.php b/library/Director/Objects/IcingaServiceSet.php
index 70903b7d..2a31b146 100644
--- a/library/Director/Objects/IcingaServiceSet.php
+++ b/library/Director/Objects/IcingaServiceSet.php
@@ -140,10 +140,13 @@ class IcingaServiceSet extends IcingaObject implements ExportInterface
     public function export()
     {
         if ($this->get('host_id')) {
-            return $this->exportSetOnHost();
+            $result = $this->exportSetOnHost();
         } else {
-            return $this->exportTemplate();
+            $result = $this->exportTemplate();
         }
+
+        unset($result->uuid);
+        return $result;
     }
 
     protected function exportSetOnHost()