diff --git a/xmodule/modulestore/xml.py b/xmodule/modulestore/xml.py
index 2b3e05fea8..0830281ba4 100644
--- a/xmodule/modulestore/xml.py
+++ b/xmodule/modulestore/xml.py
@@ -493,7 +493,9 @@ class XMLModuleStore(ModuleStoreReadBase):
                 """
                 return policy.get(policy_key(usage_id), {})
 
-            services = {}
+            services = {
+                'field-data': self.field_data
+            }
             if self.i18n_service:
                 services['i18n'] = self.i18n_service
 
@@ -513,7 +515,6 @@ class XMLModuleStore(ModuleStoreReadBase):
                 mixins=self.xblock_mixins,
                 default_class=self.default_class,
                 select=self.xblock_select,
-                field_data=self.field_data,
                 services=services,
                 target_course_id=target_course_id,
             )
diff --git a/xmodule/modulestore/xml_importer.py b/xmodule/modulestore/xml_importer.py
index 78e1901a55..d7824f5edd 100644
--- a/xmodule/modulestore/xml_importer.py
+++ b/xmodule/modulestore/xml_importer.py
@@ -954,7 +954,7 @@ def _import_course_draft(
         error_tracker=errorlog.tracker,
         load_error_modules=False,
         mixins=xml_module_store.xblock_mixins,
-        field_data=KvsFieldData(kvs=DictKeyValueStore()),
+        services={'field-data': KvsFieldData(kvs=DictKeyValueStore())},
         target_course_id=target_id,
     )