diff --git a/frontend/src/queries/nodes/HogQLQuery/hogQLQueryEditorLogic.tsx b/frontend/src/queries/nodes/HogQLQuery/hogQLQueryEditorLogic.tsx
index d6c5abab17ac2..ac798bd39056e 100644
--- a/frontend/src/queries/nodes/HogQLQuery/hogQLQueryEditorLogic.tsx
+++ b/frontend/src/queries/nodes/HogQLQuery/hogQLQueryEditorLogic.tsx
@@ -77,12 +77,13 @@ export const hogQLQueryEditorLogic = kea<hogQLQueryEditorLogicType>([
     selectors({
         aiAvailable: [() => [preflightLogic.selectors.preflight], (preflight) => preflight?.openai_available],
         multitab: [
-            (s) => [s.featureFlags],
-            (featureFlags) =>
+            (s) => [s.featureFlags, () => !!dataWarehouseSceneLogic.findMounted()?.values.editingView],
+            (featureFlags, isEditingView) =>
                 !!(
                     featureFlags[FEATURE_FLAGS.MULTITAB_EDITOR] &&
                     router.values.location.pathname.includes(urls.dataWarehouse()) &&
-                    Object.keys(router.values.hashParams).length === 0
+                    Object.keys(router.values.hashParams).length === 0 &&
+                    !isEditingView
                 ),
         ],
     }),
diff --git a/frontend/src/scenes/data-warehouse/external/dataWarehouseExternalSceneLogic.ts b/frontend/src/scenes/data-warehouse/external/dataWarehouseExternalSceneLogic.ts
index b8cc46d38df5a..3975f1dde3bd9 100644
--- a/frontend/src/scenes/data-warehouse/external/dataWarehouseExternalSceneLogic.ts
+++ b/frontend/src/scenes/data-warehouse/external/dataWarehouseExternalSceneLogic.ts
@@ -7,7 +7,6 @@ import { insightSceneLogic } from 'scenes/insights/insightSceneLogic'
 import { Scene } from 'scenes/sceneTypes'
 import { urls } from 'scenes/urls'
 
-import { examples } from '~/queries/examples'
 import { DataVisualizationNode, NodeKind } from '~/queries/schema'
 import { Breadcrumb, InsightShortId, ItemMode } from '~/types'
 
@@ -103,12 +102,6 @@ export const dataWarehouseExternalSceneLogic = kea<dataWarehouseExternalSceneLog
                 ItemMode.Edit,
                 undefined
             )
-            insightDataLogic
-                .findMounted({
-                    dashboardItemId: DATAWAREHOUSE_EDITOR_ITEM_ID,
-                    cachedInsight: null,
-                })
-                ?.actions.setQuery(examples.DataWarehouse)
         },
         '/data-warehouse/view/:id': ({ id }) => {
             insightSceneLogic.actions.setSceneState(
diff --git a/frontend/src/scenes/scenes.ts b/frontend/src/scenes/scenes.ts
index fc151e7faf012..ef2c0a9ae6b39 100644
--- a/frontend/src/scenes/scenes.ts
+++ b/frontend/src/scenes/scenes.ts
@@ -392,7 +392,6 @@ export const redirects: Record<
     '/i/:shortId': ({ shortId }) => urls.insightView(shortId),
     '/action/:id': ({ id }) => urls.action(id),
     '/action': urls.createAction(),
-    '/data-warehouse/*': urls.dataWarehouse(),
     '/events/actions': urls.actions(),
     '/events/stats': urls.eventDefinitions(),
     '/events/stats/:id': ({ id }) => urls.eventDefinition(id),