diff --git a/apps/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx b/apps/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx
index 7afed9f5cc4..a6b583f1587 100644
--- a/apps/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx
+++ b/apps/studio/components/interfaces/Settings/Logs/LogsQueryPanel.tsx
@@ -1,4 +1,3 @@
-import { useFlag } from 'common'
 import { BookOpen, Check, ChevronDown, ChevronsUpDown, Copy, ExternalLink, X } from 'lucide-react'
 import Link from 'next/link'
 import { ReactNode, useEffect, useState } from 'react'
@@ -18,12 +17,10 @@ import {
   DropdownMenuContent,
   DropdownMenuItem,
   DropdownMenuTrigger,
-  Label,
   Popover,
   PopoverContent,
   PopoverTrigger,
   SidePanel,
-  Switch,
   Tooltip,
   TooltipContent,
   TooltipTrigger,
@@ -48,8 +45,6 @@ export interface LogsQueryPanelProps {
   onSelectTemplate: (template: LogTemplate) => void
   onSelectSource: (source: string) => void
   onDateChange: (value: DatePickerValue) => void
-  useOtel?: boolean
-  onUseOtelChange?: (value: boolean) => void
 }
 
 function DropdownMenuItemContent({ name, desc }: { name: ReactNode; desc?: string }) {
@@ -68,13 +63,9 @@ const LogsQueryPanel = ({
   onSelectTemplate,
   onSelectSource,
   onDateChange,
-  useOtel = false,
-  onUseOtelChange,
 }: LogsQueryPanelProps) => {
   const [showReference, setShowReference] = useState(false)
   const { logsTemplates } = useIsFeatureEnabled(['logs:templates'])
-  const showChToggleInLogExplorer = useFlag('showChToggleInLogExplorer')
-  const otelToggleEnabled = !!showChToggleInLogExplorer && !!onUseOtelChange
 
   const {
     projectAuthAll: authEnabled,
@@ -167,30 +158,6 @@ const LogsQueryPanel = ({
               helpers={EXPLORER_DATEPICKER_HELPERS}
             />
 
-            {otelToggleEnabled && (
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <div className="flex items-center gap-2">
-                    <Switch
-                      id="logs-explorer-otel-toggle"
-                      checked={useOtel}
-                      onCheckedChange={(checked) => onUseOtelChange?.(checked)}
-                    />
-                    <Label
-                      htmlFor="logs-explorer-otel-toggle"
-                      className="text-xs text-foreground-light cursor-pointer"
-                    >
-                      OTEL endpoint
-                    </Label>
-                  </div>
-                </TooltipTrigger>
-                <TooltipContent side="bottom" className="max-w-xs">
-                  Run this query against the new ClickHouse-backed OTEL endpoint instead of
-                  BigQuery. Use to validate ClickHouse SQL before relying on it.
-                </TooltipContent>
-              </Tooltip>
-            )}
-
             <div
               data-testid="log-explorer-warnings"
               className={`transition-all duration-300 h-full ${
diff --git a/apps/studio/pages/project/[ref]/logs/explorer/index.tsx b/apps/studio/pages/project/[ref]/logs/explorer/index.tsx
index 17a086e7590..3675f041fe9 100644
--- a/apps/studio/pages/project/[ref]/logs/explorer/index.tsx
+++ b/apps/studio/pages/project/[ref]/logs/explorer/index.tsx
@@ -1,6 +1,6 @@
 import { useMonaco } from '@monaco-editor/react'
 import { useLocalStorage } from '@uidotdev/usehooks'
-import { IS_PLATFORM, LOCAL_STORAGE_KEYS, useParams } from 'common'
+import { IS_PLATFORM, LOCAL_STORAGE_KEYS, useFlag, useParams } from 'common'
 import dayjs from 'dayjs'
 import type { editor } from 'monaco-editor'
 import { useRouter } from 'next/router'
@@ -55,6 +55,9 @@ const LOCAL_PLACEHOLDER_QUERY =
 const PLATFORM_PLACEHOLDER_QUERY =
   'select\n  cast(timestamp as datetime) as timestamp,\n  event_message, metadata \nfrom edge_logs \nlimit 5'
 
+const OTEL_PLACEHOLDER_QUERY =
+  "select\n  timestamp,\n  event_message,\n  log_attributes\nfrom logs\nwhere source = 'edge_logs'\norder by timestamp desc\nlimit 5"
+
 export const LogsExplorerPage: NextPageWithLayout = () => {
   useEditorHints()
   const monaco = useMonaco()
@@ -90,10 +93,14 @@ export const LogsExplorerPage: NextPageWithLayout = () => {
   }, [timestampStart, timestampEnd, defaultHelper])
   const [datePickerValue, setDatePickerValue] = useState<DatePickerValue>(initialDatePickerValue)
 
+  const useOtelEndpoint = useFlag('otelLegacyLogs')
+
   const { logsDefaultQuery } = useCustomContent(['logs:default_query'])
-  const PLACEHOLDER_QUERY = IS_PLATFORM
-    ? (logsDefaultQuery ?? PLATFORM_PLACEHOLDER_QUERY)
-    : LOCAL_PLACEHOLDER_QUERY
+  const PLACEHOLDER_QUERY = useOtelEndpoint
+    ? OTEL_PLACEHOLDER_QUERY
+    : IS_PLATFORM
+      ? (logsDefaultQuery ?? PLATFORM_PLACEHOLDER_QUERY)
+      : LOCAL_PLACEHOLDER_QUERY
 
   const [editorValue, setEditorValue] = useState<string>(PLACEHOLDER_QUERY)
   const [saveModalOpen, setSaveModalOpen] = useState<boolean>(false)
@@ -105,11 +112,6 @@ export const LogsExplorerPage: NextPageWithLayout = () => {
     []
   )
 
-  const [useOtelEndpoint, setUseOtelEndpoint] = useLocalStorage<boolean>(
-    `logs-explorer-use-otel-endpoint-${projectRef}`,
-    false
-  )
-
   const { getEntitlementNumericValue } = useCheckEntitlements('log.retention_days')
   const entitledToAuditLogDays = getEntitlementNumericValue()
 
@@ -332,6 +334,18 @@ export const LogsExplorerPage: NextPageWithLayout = () => {
     }
   }, [q, search, setSearch])
 
+  useEffect(() => {
+    if (!useOtelEndpoint || q || search || queryId) return
+    if (editorValue === OTEL_PLACEHOLDER_QUERY) return
+    const isUntouchedDefault =
+      editorValue === LOCAL_PLACEHOLDER_QUERY ||
+      editorValue === PLATFORM_PLACEHOLDER_QUERY ||
+      editorValue === logsDefaultQuery
+    if (!isUntouchedDefault) return
+    setEditorValue(OTEL_PLACEHOLDER_QUERY)
+    editorRef.current?.setValue(OTEL_PLACEHOLDER_QUERY)
+  }, [useOtelEndpoint, q, search, queryId, editorValue, logsDefaultQuery])
+
   useEffect(() => {
     // prevents overwriting when the user selects a helper.
     // without this, if the user selects "last 3 days" it would overwrite it with "last hour"
@@ -386,8 +400,6 @@ export const LogsExplorerPage: NextPageWithLayout = () => {
             templates={allTemplates.filter((template) => template.mode === 'custom')}
             onSelectTemplate={onSelectTemplate}
             warnings={warnings}
-            useOtel={useOtelEndpoint}
-            onUseOtelChange={setUseOtelEndpoint}
           />
           <ShimmerLine active={isLoading} />
           <CodeEditor