diff --git a/app/Jobs/Export.php b/app/Jobs/Export.php
index a3212e2a..49c23440 100644
--- a/app/Jobs/Export.php
+++ b/app/Jobs/Export.php
@@ -46,7 +46,7 @@ public function runNow(array $data, ?Job $job = null): void
 
             // put attributes to metadata as fields
             if (!empty($entityName) && $this->getMetadata()->get("scopes.$entityName.hasAttribute")) {
-                $exportFeedService->putAttributesToMetadata($exportJob->get('exportFeedId'), $data['feed']);
+                $exportFeedService->putAttributesToMetadata($exportJob->get('exportFeedId') ?? $data['feed']['id'], $data['feed']);
             }
 
             $typeService = $exportFeedService->getExportTypeService($data['feed']['type']);
diff --git a/app/Jobs/ExportChunk.php b/app/Jobs/ExportChunk.php
index da541d2e..3ab25885 100644
--- a/app/Jobs/ExportChunk.php
+++ b/app/Jobs/ExportChunk.php
@@ -45,7 +45,7 @@ public function run(Job $job): void
 
         // put attributes to metadata as fields
         if (!empty($entityName) && $this->getMetadata()->get("scopes.$entityName.hasAttribute")) {
-            $exportFeedService->putAttributesToMetadata($exportJob->get('exportFeedId'), $data['feed']);
+            $exportFeedService->putAttributesToMetadata($exportJob->get('exportFeedId') ?? $data['feed']['id'], $data['feed']);
         }
 
         $res = $typeService->createCacheChunk();
diff --git a/app/Repositories/ExportJob.php b/app/Repositories/ExportJob.php
index 0db0dafd..4e079ab6 100644
--- a/app/Repositories/ExportJob.php
+++ b/app/Repositories/ExportJob.php
@@ -81,8 +81,10 @@ protected function afterSave(Entity $entity, array $options = [])
             }
 
             // update last status
-            $this->getEntityManager()->getRepository('ExportFeed')
-                ->updateLastStatus($entity->get('exportFeedId'), $entity->get('state'));
+            if (!empty($entity->get('exportFeedId'))) {
+                $this->getEntityManager()->getRepository('ExportFeed')
+                    ->updateLastStatus($entity->get('exportFeedId'), $entity->get('state'));
+            }
         }
 
         if (!empty($feed = $entity->get('exportFeed'))) {
diff --git a/app/Services/ExportFeed.php b/app/Services/ExportFeed.php
index 9dac2f9f..2c267365 100644
--- a/app/Services/ExportFeed.php
+++ b/app/Services/ExportFeed.php
@@ -1104,6 +1104,7 @@ public function putAttributesToMetadata(string $exportFeedId, ?array $feedData =
         }
 
         $exportFeed = $this->getEntityManager()->getEntity('ExportFeed', $exportFeedId);
+
         if (empty($exportFeed)) {
             if ($feedData === null) {
                 return;