diff --git a/crc/services/workflow_service.py b/crc/services/workflow_service.py
index 0e1474a9..145c8056 100644
--- a/crc/services/workflow_service.py
+++ b/crc/services/workflow_service.py
@@ -281,7 +281,8 @@ class WorkflowService(object):
                 # At least attempt to clear out the data.
                 data = {}
         if field.has_property(Task.FIELD_PROP_FILE_DATA) and \
-                field.get_property(Task.FIELD_PROP_FILE_DATA) in data:
+                field.get_property(Task.FIELD_PROP_FILE_DATA) in data and \
+                field.id in data:
             file_id = data[field.get_property(Task.FIELD_PROP_FILE_DATA)]["id"]
             data_store = DataStoreModel(file_id=file_id, key=field.id, value=data[field.id])
             db.session.add(data_store)