diff --git a/static/app/views/dashboards/manage/index.tsx b/static/app/views/dashboards/manage/index.tsx
index 53ff00990f0b39..e7267b22d0bdf3 100644
--- a/static/app/views/dashboards/manage/index.tsx
+++ b/static/app/views/dashboards/manage/index.tsx
@@ -170,6 +170,9 @@ function ManageDashboards() {
   const isOnlyPrebuilt =
     hasPrebuiltDashboards && urlFilter === DashboardFilter.ONLY_PREBUILT;
 
+  const areAiFeaturesAllowed =
+    !organization.hideAiFeatures && organization.features.includes('gen-ai-features');
+
   const [showTemplates, setShowTemplatesLocal] = useLocalStorageState(
     SHOW_TEMPLATES_KEY,
     shouldShowTemplates()
@@ -655,9 +658,9 @@ function ManageDashboards() {
                       )}
 
                       <FeedbackButton />
-                      <Feature features="dashboards-ai-generate">
+                      <Feature features={['dashboards-ai-generate']}>
                         {({hasFeature: hasAiGenerate}) =>
-                          hasAiGenerate ? (
+                          hasAiGenerate && areAiFeaturesAllowed ? (
                             <DashboardCreateLimitWrapper>
                               {({
                                 hasReachedDashboardLimit,
@@ -680,7 +683,7 @@ function ManageDashboards() {
                                       label: (
                                         <Flex gap="sm" align="center" as="span">
                                           {t('Generate dashboard')}
-                                          <FeatureBadge type="experimental" />
+                                          <FeatureBadge type="beta" />
                                         </Flex>
                                       ),
                                       onAction: () => onGenerateDashboard(),