diff --git a/frontend/src/scenes/data-warehouse/editor/OutputPane.tsx b/frontend/src/scenes/data-warehouse/editor/OutputPane.tsx
index 2fd8adf883adb..517073e70c91f 100644
--- a/frontend/src/scenes/data-warehouse/editor/OutputPane.tsx
+++ b/frontend/src/scenes/data-warehouse/editor/OutputPane.tsx
@@ -7,6 +7,8 @@ import { useActions, useValues } from 'kea'
 import { AnimationType } from 'lib/animations/animations'
 import { Animation } from 'lib/components/Animation/Animation'
 import { ExportButton } from 'lib/components/ExportButton/ExportButton'
+import { FEATURE_FLAGS } from 'lib/constants'
+import { featureFlagLogic } from 'lib/logic/featureFlagLogic'
 import { useMemo } from 'react'
 import DataGrid from 'react-data-grid'
 import { InsightErrorState, StatelessInsightLoadingState } from 'scenes/insights/EmptyStates'
@@ -45,6 +47,7 @@ export function OutputPane(): JSX.Element {
     const { dataWarehouseSavedQueriesLoading } = useValues(dataWarehouseViewsLogic)
     const { updateDataWarehouseSavedQuery } = useActions(dataWarehouseViewsLogic)
     const { visualizationType, queryCancelled } = useValues(dataVisualizationLogic)
+    const { featureFlags } = useValues(featureFlagLogic)
 
     const vizKey = useMemo(() => `SQLEditorScene`, [])
 
@@ -91,10 +94,14 @@ export function OutputPane(): JSX.Element {
                             key: OutputTab.Visualization,
                             label: 'Visualization',
                         },
-                        {
-                            key: OutputTab.Info,
-                            label: 'Info',
-                        },
+                        ...(featureFlags[FEATURE_FLAGS.DATA_MODELING]
+                            ? [
+                                  {
+                                      key: OutputTab.Info,
+                                      label: 'Info',
+                                  },
+                              ]
+                            : []),
                     ]}
                 />
                 <div className="flex gap-4">
diff --git a/frontend/src/scenes/data-warehouse/editor/QueryTabs.tsx b/frontend/src/scenes/data-warehouse/editor/QueryTabs.tsx
index 85c9d80ef6270..d060984b41512 100644
--- a/frontend/src/scenes/data-warehouse/editor/QueryTabs.tsx
+++ b/frontend/src/scenes/data-warehouse/editor/QueryTabs.tsx
@@ -46,7 +46,7 @@ function QueryTabComponent({ model, active, onClear, onClick }: QueryTabProps):
                 onClear ? 'pl-3 pr-2' : 'px-3'
             )}
         >
-            {model.view?.name ?? 'Untitled'}
+            {model.view?.name ?? 'New query'}
             {onClear && (
                 <LemonButton
                     onClick={(e) => {