diff --git a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
index fc0b67f63d..3951c0e902 100644
--- a/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
+++ b/packages/builder/src/pages/builder/app/[application]/design/[screenId]/_components/AppPreview.svelte
@@ -11,7 +11,7 @@
     selectedScreen,
     hoverStore,
     componentTreeNodesStore,
-    screenComponentStore,
+    screenComponentErrors,
     snippets,
   } from "@/stores/builder"
   import ConfirmDialog from "@/components/common/ConfirmDialog.svelte"
@@ -69,7 +69,7 @@
       port: window.location.port,
     },
     snippets: $snippets,
-    componentErrors: $screenComponentStore.errors,
+    componentErrors: $screenComponentErrors,
   }
 
   // Refresh the preview when required
diff --git a/packages/builder/src/stores/builder/index.js b/packages/builder/src/stores/builder/index.js
index 23491996d1..892b72c7ab 100644
--- a/packages/builder/src/stores/builder/index.js
+++ b/packages/builder/src/stores/builder/index.js
@@ -16,7 +16,7 @@ import { userStore, userSelectedResourceMap, isOnlyUser } from "./users.js"
 import { deploymentStore } from "./deployments.js"
 import { contextMenuStore } from "./contextMenu.js"
 import { snippets } from "./snippets"
-import { screenComponentStore } from "./screenComponent"
+import { screenComponentErrors } from "./screenComponent"
 
 // Backend
 import { tables } from "./tables"
@@ -68,7 +68,7 @@ export {
   snippets,
   rowActions,
   appPublished,
-  screenComponentStore,
+  screenComponentErrors,
 }
 
 export const reset = () => {
diff --git a/packages/builder/src/stores/builder/screenComponent.ts b/packages/builder/src/stores/builder/screenComponent.ts
index b4eb01a3b7..19bafeade3 100644
--- a/packages/builder/src/stores/builder/screenComponent.ts
+++ b/packages/builder/src/stores/builder/screenComponent.ts
@@ -2,79 +2,57 @@ import { derived } from "svelte/store"
 import { tables } from "./tables"
 import { selectedScreen } from "./screens"
 import { viewsV2 } from "./viewsV2"
-import { DerivedBudiStore } from "../BudiStore"
 import { findComponentsBySettingsType } from "@/helpers/screen"
 import { Screen, Table, ViewV2 } from "@budibase/types"
 
-interface BuilderScreenComponentStore {}
+export const screenComponentErrors = derived(
+  [selectedScreen, tables, viewsV2],
+  ([$selectedScreen, $tables, $viewsV2]): Record<string, string[]> => {
+    function flattenTablesAndViews(tables: Table[], views: ViewV2[]) {
+      return {
+        ...tables.reduce(
+          (list, table) => ({
+            ...list,
+            [table._id!]: table,
+          }),
+          {}
+        ),
+        ...views.reduce(
+          (list, view) => ({
+            ...list,
+            [view.id]: view,
+          }),
+          {}
+        ),
+      }
+    }
 
-interface DerivedScreenComponentStore extends BuilderScreenComponentStore {
-  errors: Record<string, string[]>
-}
+    function getInvalidDatasources(
+      screen: Screen,
+      datasources: Record<string, any>
+    ) {
+      const friendlyNameByType = {
+        table: "table",
+        view: "view",
+        viewV2: "view",
+      }
 
-export class ScreenComponentStore extends DerivedBudiStore<
-  BuilderScreenComponentStore,
-  DerivedScreenComponentStore
-> {
-  constructor() {
-    const makeDerivedStore = () => {
-      return derived(
-        [selectedScreen, tables, viewsV2],
-        ([$selectedScreen, $tables, $viewsV2]): DerivedScreenComponentStore => {
-          const datasources = flattenTablesAndViews($tables.list, $viewsV2.list)
-          return {
-            errors: getInvalidDatasources($selectedScreen, datasources),
-          }
+      const result: Record<string, string[]> = {}
+      for (const component of findComponentsBySettingsType(screen, "table")) {
+        const { resourceId, type, label } = component.dataSource
+        if (!datasources[resourceId]) {
+          const friendlyTypeName =
+            friendlyNameByType[type as keyof typeof friendlyNameByType]
+          result[component._id!] = [
+            `The ${friendlyTypeName} named "${label}" does not exist`,
+          ]
         }
-      )
+      }
+
+      return result
     }
 
-    super({}, makeDerivedStore)
+    const datasources = flattenTablesAndViews($tables.list, $viewsV2.list)
+    return getInvalidDatasources($selectedScreen, datasources)
   }
-}
-
-export const screenComponentStore = new ScreenComponentStore()
-
-function flattenTablesAndViews(tables: Table[], views: ViewV2[]) {
-  return {
-    ...tables.reduce(
-      (list, table) => ({
-        ...list,
-        [table._id!]: table,
-      }),
-      {}
-    ),
-    ...views.reduce(
-      (list, view) => ({
-        ...list,
-        [view.id]: view,
-      }),
-      {}
-    ),
-  }
-}
-
-function getInvalidDatasources(
-  screen: Screen,
-  datasources: Record<string, any>
-) {
-  const friendlyNameByType = {
-    table: "table",
-    view: "view",
-    viewV2: "view",
-  }
-
-  const result: Record<string, string[]> = {}
-  for (const component of findComponentsBySettingsType(screen, "table")) {
-    const { resourceId, type, label } = component.dataSource
-    if (!datasources[resourceId]) {
-      const friendlyTypeName =
-        friendlyNameByType[type as keyof typeof friendlyNameByType]
-      result[component._id!] = [
-        `The ${friendlyTypeName} named "${label}" does not exist`,
-      ]
-    }
-  }
-
-  return result
-}
+)