diff --git a/apps/studio/data/entitlements/entitlements-query.ts b/apps/studio/data/entitlements/entitlements-query.ts
index c06df0e7dc9..991539c6571 100644
--- a/apps/studio/data/entitlements/entitlements-query.ts
+++ b/apps/studio/data/entitlements/entitlements-query.ts
@@ -11,6 +11,7 @@ export type EntitlementsVariables = {
 export type EntitlementConfig =
   components['schemas']['ListEntitlementsResponse']['entitlements'][0]['config']
 export type Entitlement = components['schemas']['ListEntitlementsResponse']['entitlements'][0]
+export type EntitlementType = Entitlement['type']
 
 export async function getEntitlements({ slug }: EntitlementsVariables, signal?: AbortSignal) {
   if (!slug) throw new Error('slug is required')
diff --git a/apps/studio/hooks/misc/useCheckEntitlements.ts b/apps/studio/hooks/misc/useCheckEntitlements.ts
index fc8e3545d67..7ec95dd8eef 100644
--- a/apps/studio/hooks/misc/useCheckEntitlements.ts
+++ b/apps/studio/hooks/misc/useCheckEntitlements.ts
@@ -1,20 +1,27 @@
 import { useEntitlementsQuery } from 'data/entitlements/entitlements-query'
 import { useMemo } from 'react'
 import { useSelectedOrganizationQuery } from './useSelectedOrganization'
-import type { EntitlementConfig } from 'data/entitlements/entitlements-query'
+import type { EntitlementConfig, EntitlementType } from 'data/entitlements/entitlements-query'
 
 function isNumericConfig(
-  config: EntitlementConfig
+  config: EntitlementConfig,
+  type: EntitlementType
 ): config is { enabled: boolean; unlimited: boolean; value: number } {
-  return 'unlimited' in config && 'value' in config
+  return type === 'numeric'
 }
 
-function isSetConfig(config: EntitlementConfig): config is { enabled: boolean; set: string[] } {
-  return 'set' in config
+function isSetConfig(
+  config: EntitlementConfig,
+  type: EntitlementType
+): config is { enabled: boolean; set: string[] } {
+  return type === 'set'
 }
 
-function isBooleanConfig(config: EntitlementConfig): config is { enabled: boolean } {
-  return !('unlimited' in config) && !('set' in config)
+function isBooleanConfig(
+  config: EntitlementConfig,
+  type: EntitlementType
+): config is { enabled: boolean } {
+  return type === 'boolean'
 }
 
 export function useCheckEntitlements(
@@ -43,21 +50,22 @@ export function useCheckEntitlements(
     isSuccess: isSuccessEntitlements,
   } = useEntitlementsQuery({ slug: finalOrgSlug! }, { enabled })
 
-  const { hasAccess, entitlementConfig } = useMemo((): {
+  const { hasAccess, entitlementConfig, entitlementType } = useMemo((): {
     hasAccess: boolean
-    entitlementConfig: EntitlementConfig
+    entitlementConfig: EntitlementConfig | null
+    entitlementType: EntitlementType | null
   } => {
     // If no organization slug, no access
-    if (!finalOrgSlug) return { hasAccess: false, entitlementConfig: { enabled: false } }
+    if (!finalOrgSlug) return { hasAccess: false, entitlementConfig: null, entitlementType: null }
 
     const entitlement = entitlementsData?.entitlements.find(
       (entitlement) => entitlement.feature.key === featureKey
     )
-    const entitlementConfig = entitlement?.config ?? { enabled: false }
+    const entitlementConfig = entitlement?.config ?? null
 
-    if (!entitlement) return { hasAccess: false, entitlementConfig: { enabled: false } }
+    if (!entitlement) return { hasAccess: false, entitlementConfig, entitlementType: null }
 
-    return { hasAccess: entitlement.hasAccess, entitlementConfig }
+    return { hasAccess: entitlement.hasAccess, entitlementConfig, entitlementType: entitlement.type }
   }, [entitlementsData, featureKey, finalOrgSlug])
 
   const isLoading = shouldGetSelectedOrg ? isLoadingSelectedOrg : isLoadingEntitlements
@@ -70,9 +78,9 @@ export function useCheckEntitlements(
     isLoading,
     isSuccess,
     getEntitlementNumericValue: () =>
-      isNumericConfig(entitlementConfig) ? entitlementConfig.value : undefined,
+      entitlementConfig && entitlementType && isNumericConfig(entitlementConfig, entitlementType) ? entitlementConfig.value : undefined,
     isEntitlementUnlimited: () =>
-      isNumericConfig(entitlementConfig) ? entitlementConfig.unlimited : false,
-    getEntitlementSetValues: () => (isSetConfig(entitlementConfig) ? entitlementConfig.set : []),
+      entitlementConfig && entitlementType && isNumericConfig(entitlementConfig, entitlementType) ? entitlementConfig.unlimited : false,
+    getEntitlementSetValues: () => entitlementConfig && entitlementType && isSetConfig(entitlementConfig, entitlementType) ? entitlementConfig.set : [],
   }
 }
diff --git a/packages/api-types/types/platform.d.ts b/packages/api-types/types/platform.d.ts
index bbc76eb612c..e34b8bd5d84 100644
--- a/packages/api-types/types/platform.d.ts
+++ b/packages/api-types/types/platform.d.ts
@@ -6842,6 +6842,7 @@ export interface components {
             }
           | {
               enabled: boolean
+              unit: string
               unlimited: boolean
               value: number
             }
@@ -6855,6 +6856,8 @@ export interface components {
           type: 'boolean' | 'numeric' | 'set'
         }
         hasAccess: boolean
+        /** @enum {string} */
+        type: 'boolean' | 'numeric' | 'set'
       }[]
     }
     ListGitHubConnectionsResponse: {