diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08c58e74e5..b6b5dda058 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## [0.13.10-beta.0](https://github.com/payloadcms/payload/compare/v0.13.6...v0.13.10-beta.0) (2021-12-21)
+## [0.13.11-beta.0](https://github.com/payloadcms/payload/compare/v0.13.6...v0.13.11-beta.0) (2021-12-22)
 
 
 ### Bug Fixes
@@ -6,6 +6,7 @@
 * [#370](https://github.com/payloadcms/payload/issues/370), only performs password functions when auth enabled ([9738873](https://github.com/payloadcms/payload/commit/97388738def687f3b26eaf8de6b067f4d3758418))
 * [#390](https://github.com/payloadcms/payload/issues/390), safari rich text link bug ([a16b99b](https://github.com/payloadcms/payload/commit/a16b99b0c87d55f768ed74ab35708a291fc7bbb0))
 * [#393](https://github.com/payloadcms/payload/issues/393), ensures preview button gets up to date data ([2f47e39](https://github.com/payloadcms/payload/commit/2f47e39a9f765bd8ce437d4b7500a5b314a192a5))
+* ensures getDataByPath works ([140a3aa](https://github.com/payloadcms/payload/commit/140a3aa9eafa29b2a43bdfd8883c79c6ee4a93e4))
 
 
 ### Features
diff --git a/demo/collections/CustomComponents/components/fields/Text/Field/index.tsx b/demo/collections/CustomComponents/components/fields/Text/Field/index.tsx
index 5ff2865517..05832c64c1 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 9ccc4713ff..d8eac8332f 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/package.json b/package.json
index 9803b6d0ed..72ce6dbe1e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "payload",
-  "version": "0.13.10-beta.0",
+  "version": "0.13.11-beta.0",
   "description": "Node, React and MongoDB Headless CMS and Application Framework",
   "license": "SEE LICENSE IN license.md",
   "author": {
diff --git a/src/admin/components/forms/Form/getDataByPath.ts b/src/admin/components/forms/Form/getDataByPath.ts
index ff4315bac4..a139d02fe9 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],