diff --git a/demo/collections/CustomComponents/components/fields/Text/Field/index.tsx b/demo/collections/CustomComponents/components/fields/Text/Field/index.tsx
index 5ff286551..05832c64c 100644
--- a/demo/collections/CustomComponents/components/fields/Text/Field/index.tsx
+++ b/demo/collections/CustomComponents/components/fields/Text/Field/index.tsx
@@ -31,6 +31,7 @@ const Text: React.FC<TextFieldType> = (props) => {
 
   return (
     <TextInput
+      path={path}
       name={name}
       value={value as string || ''}
       label={label}
diff --git a/nodemon.json b/nodemon.json
index 9ccc4713f..d8eac8332 100644
--- a/nodemon.json
+++ b/nodemon.json
@@ -4,7 +4,8 @@
     "node_modules",
     "node_modules/**/node_modules",
     "src/admin",
-    "src/**/*.spec.ts"
+    "src/**/*.spec.ts",
+    "demo/**/*.tsx"
   ],
   "watch": [
     "src/**/*.ts",
diff --git a/src/admin/components/forms/Form/getDataByPath.ts b/src/admin/components/forms/Form/getDataByPath.ts
index ff4315bac..a139d02fe 100644
--- a/src/admin/components/forms/Form/getDataByPath.ts
+++ b/src/admin/components/forms/Form/getDataByPath.ts
@@ -7,7 +7,7 @@ const getDataByPath = (fields: Fields, path: string): unknown => {
   const name = path.split('.').pop();
 
   const data = Object.keys(fields).reduce((matchedData, key) => {
-    if (key.indexOf(`${path}.`) === 0) {
+    if (key.indexOf(`${path}.`) === 0 || key === path) {
       return {
         ...matchedData,
         [key.replace(pathPrefixToRemove, '')]: fields[key],