diff --git a/src/components/UniversalCard/schema.js b/src/components/UniversalCard/schema.js
index 4835fd12..8b8a7591 100644
--- a/src/components/UniversalCard/schema.js
+++ b/src/components/UniversalCard/schema.js
@@ -113,6 +113,7 @@ const CardSchema = ({ formData }) => {
 
 export default function universalCardSchemaEnhancer(props) {
   const { schema } = props;
+  props.formData = props.formData || props.data;
   const enhancer = schemaEnhancerFactory({
     extensionName: 'cardTemplates',
     messages,
diff --git a/src/components/UniversalItem/schema.js b/src/components/UniversalItem/schema.js
index fe657b90..9128ab29 100644
--- a/src/components/UniversalItem/schema.js
+++ b/src/components/UniversalItem/schema.js
@@ -77,6 +77,7 @@ const ItemSchema = ({ formData }) => {
 
 export default function universalItemSchemaEnhancer(props) {
   const { schema } = props;
+  props.formData = props.formData || props.data;
 
   const enhanceItemModel = schemaEnhancerFactory({
     extensionName: 'itemTemplates',