diff --git a/packages/builder/src/stores/portal/auth.ts b/packages/builder/src/stores/portal/auth.ts
index afbb75646c..171b2b43ae 100644
--- a/packages/builder/src/stores/portal/auth.ts
+++ b/packages/builder/src/stores/portal/auth.ts
@@ -4,14 +4,14 @@ import { admin } from "@/stores/portal"
 import analytics from "@/analytics"
 import { BudiStore } from "@/stores/BudiStore"
 import {
+  GetGlobalSelfResponse,
   isSSOUser,
   SetInitInfoRequest,
   UpdateSelfRequest,
-  User,
 } from "@budibase/types"
 
 interface PortalAuthStore {
-  user?: User
+  user?: GetGlobalSelfResponse
   initInfo?: Record<string, any>
   accountPortalAccess: boolean
   loaded: boolean
@@ -33,7 +33,7 @@ class AuthStore extends BudiStore<PortalAuthStore> {
     })
   }
 
-  setUser(user?: User) {
+  setUser(user?: GetGlobalSelfResponse) {
     this.set({
       loaded: true,
       user: user,
diff --git a/packages/builder/src/stores/portal/featureFlags.js b/packages/builder/src/stores/portal/featureFlags.js
deleted file mode 100644
index ef1100310a..0000000000
--- a/packages/builder/src/stores/portal/featureFlags.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import { derived } from "svelte/store"
-import { auth } from "@/stores/portal"
-
-export const INITIAL_FEATUREFLAG_STATE = {
-  SQS: false,
-  DEFAULT_VALUES: false,
-  BUDIBASE_AI: false,
-  AI_CUSTOM_CONFIGS: false,
-}
-
-export const featureFlags = derived([auth], ([$auth]) => {
-  return {
-    ...INITIAL_FEATUREFLAG_STATE,
-    ...($auth?.user?.flags || {}),
-  }
-})
diff --git a/packages/builder/src/stores/portal/featureFlags.ts b/packages/builder/src/stores/portal/featureFlags.ts
new file mode 100644
index 0000000000..0e40d0c7b4
--- /dev/null
+++ b/packages/builder/src/stores/portal/featureFlags.ts
@@ -0,0 +1,8 @@
+import { derived, Readable } from "svelte/store"
+import { auth } from "@/stores/portal"
+import { FeatureFlags, FeatureFlagDefaults } from "@budibase/types"
+
+export const featureFlags: Readable<FeatureFlags> = derived(auth, $auth => ({
+  ...FeatureFlagDefaults,
+  ...($auth?.user?.flags || {}),
+}))