diff --git a/packages/client/src/components/Component.svelte b/packages/client/src/components/Component.svelte
index 57daf8cd12..8d79de2ac4 100644
--- a/packages/client/src/components/Component.svelte
+++ b/packages/client/src/components/Component.svelte
@@ -23,7 +23,6 @@
     appStore,
     dndComponentPath,
     dndIsDragging,
-    componentErrors,
   } from "stores"
   import { Helpers } from "@budibase/bbui"
   import { getActiveConditions, reduceConditionActions } from "utils/conditions"
@@ -139,7 +138,7 @@
 
   // Derive definition properties which can all be optional, so need to be
   // coerced to booleans
-  $: invalidSettings = $componentErrors[instance._id]
+  $: invalidSettings = $builderStore.componentErrors[instance._id]
   $: hasChildren = !!definition?.hasChildren
   $: showEmptyState = definition?.showEmptyState !== false
   $: hasMissingRequiredSettings = missingRequiredSettings?.length > 0
diff --git a/packages/client/src/stores/derived/componentErrors.ts b/packages/client/src/stores/derived/componentErrors.ts
deleted file mode 100644
index 68e87a061d..0000000000
--- a/packages/client/src/stores/derived/componentErrors.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { derived } from "svelte/store"
-import { builderStore } from "../builder.js"
-
-export const componentErrors = derived([builderStore], ([$builderStore]) => {
-  return $builderStore.componentErrors
-})
diff --git a/packages/client/src/stores/derived/index.js b/packages/client/src/stores/derived/index.js
index e7e70d8952..337c73831f 100644
--- a/packages/client/src/stores/derived/index.js
+++ b/packages/client/src/stores/derived/index.js
@@ -5,4 +5,3 @@ export { currentRole } from "./currentRole.js"
 export { dndComponentPath } from "./dndComponentPath.js"
 export { devToolsEnabled } from "./devToolsEnabled.js"
 export { snippets } from "./snippets.js"
-export { componentErrors } from "./componentErrors"