diff --git a/application/forms/BasketUploadForm.php b/application/forms/BasketUploadForm.php
index b2b9543f..a88dc06a 100644
--- a/application/forms/BasketUploadForm.php
+++ b/application/forms/BasketUploadForm.php
@@ -122,7 +122,9 @@ class BasketUploadForm extends DirectorObjectForm
         $basket = $this->object();
 
         foreach ($this->upload as $type => $content) {
-            $basket->addObjects($type, array_keys((array) $content));
+            if ($type !== 'Datafield') {
+                $basket->addObjects($type, array_keys((array) $content));
+            }
         }
         if ($basket->isEmpty()) {
             $this->addError($this->translate("It's not allowed to store an empty basket"));
diff --git a/library/Director/DirectorObject/Automation/Basket.php b/library/Director/DirectorObject/Automation/Basket.php
index d78e1640..7fe464ad 100644
--- a/library/Director/DirectorObject/Automation/Basket.php
+++ b/library/Director/DirectorObject/Automation/Basket.php
@@ -61,6 +61,7 @@ class Basket extends DbObject implements ExportInterface
     protected function onLoadFromDb()
     {
         $this->chosenObjects = (array) Json::decode($this->get('objects'));
+        unset($this->chosenObjects['Datafield']); // Might be in old baskets
     }
 
     public function getUniqueIdentifier()