diff --git a/packages/client/src/components/app/forms/Field.svelte b/packages/client/src/components/app/forms/Field.svelte
index a5d66538c4..33d7fc91e7 100644
--- a/packages/client/src/components/app/forms/Field.svelte
+++ b/packages/client/src/components/app/forms/Field.svelte
@@ -5,11 +5,12 @@
   import { memo } from "@budibase/frontend-core"
   import Placeholder from "../Placeholder.svelte"
   import InnerForm from "./InnerForm.svelte"
+  import { FieldApi } from "."
 
   export let label: string | undefined = undefined
   export let field: string | undefined = undefined
   export let fieldState: any
-  export let fieldApi: any
+  export let fieldApi: FieldApi
   export let fieldSchema: any
   export let defaultValue: string | undefined = undefined
   export let type: any
diff --git a/packages/client/src/components/app/forms/RelationshipField.svelte b/packages/client/src/components/app/forms/RelationshipField.svelte
index cd5d4a6ece..6f71195f2c 100644
--- a/packages/client/src/components/app/forms/RelationshipField.svelte
+++ b/packages/client/src/components/app/forms/RelationshipField.svelte
@@ -9,7 +9,7 @@
     RelationshipFieldMetadata,
     Row,
   } from "@budibase/types"
-  import { FieldApi } from "."
+  import { FieldApi, FieldState } from "."
 
   export let field: string | undefined = undefined
   export let label: string | undefined = undefined
@@ -36,14 +36,7 @@
   const { API } = getContext("sdk")
 
   // Field state
-  let fieldState:
-    | {
-        value: string | string[]
-        fieldId: string
-        disabled: boolean
-        readonly: boolean
-      }
-    | undefined
+  let fieldState: FieldState<string | string[]> | undefined
 
   let fieldApi: FieldApi
   let fieldSchema: RelationshipFieldMetadata | undefined
diff --git a/packages/client/src/components/app/forms/index.ts b/packages/client/src/components/app/forms/index.ts
index d05cf42672..ffb874a5e2 100644
--- a/packages/client/src/components/app/forms/index.ts
+++ b/packages/client/src/components/app/forms/index.ts
@@ -22,4 +22,12 @@ export { default as bbreferencesinglefield } from "./BBReferenceSingleField.svel
 
 export interface FieldApi {
   setValue(value: any): boolean
+  deregister(): void
+}
+
+export interface FieldState<T> {
+  value: T
+  fieldId: string
+  disabled: boolean
+  readonly: boolean
 }