diff --git a/wcs/formdata.py b/wcs/formdata.py
index 0a8bfdf47..0ec50b9a6 100644
--- a/wcs/formdata.py
+++ b/wcs/formdata.py
@@ -684,12 +684,8 @@ class FormData(StorableObject):
 
         if self.tracking_code:
             d['form_tracking_code'] = self.tracking_code
-        elif not self.status and self.data:
-            if 'future_tracking_code' in self.data:
-                d['form_tracking_code'] = self.data['future_tracking_code']
-            elif 'draft_formdata_id' in self.data:
-                formdata = self.formdef.data_class().get(self.data['draft_formdata_id'])
-                d['form_tracking_code'] = formdata.tracking_code
+        elif not self.status and self.data and 'future_tracking_code' in self.data:
+            d['form_tracking_code'] = self.data['future_tracking_code']
 
         d['form_submission_backoffice'] = self.backoffice_submission
         d['form_submission_channel'] = self.submission_channel