diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index f6ad6143a58..a6f3f4fd147 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -383,6 +383,7 @@ playwright.config.ts @grafana/plugins-platform-frontend
 /public/app/core/components/TimeSeries/ @grafana/dataviz-squad
 /public/app/core/components/TimelineChart/ @grafana/dataviz-squad
 /public/app/core/components/Form/ @grafana/grafana-frontend-platform
+/public/app/core/history/ @grafana/explore-squad
 /public/app/features/all.ts @grafana/grafana-frontend-platform
 /public/app/features/admin/ @grafana/identity-access-team
 
diff --git a/public/app/core/history/richHistoryLocalStorageUtils.ts b/public/app/core/history/richHistoryLocalStorageUtils.ts
index 409bc4c64d6..0cd8da310cb 100644
--- a/public/app/core/history/richHistoryLocalStorageUtils.ts
+++ b/public/app/core/history/richHistoryLocalStorageUtils.ts
@@ -94,7 +94,7 @@ export const sortQueries = (array: RichHistoryQuery[], sortOrder: SortOrder) =>
 export const RICH_HISTORY_SETTING_KEYS = {
   retentionPeriod: 'grafana.explore.richHistory.retentionPeriod',
   starredTabAsFirstTab: 'grafana.explore.richHistory.starredTabAsFirstTab',
-  legacyActiveDatasourceOnly: 'grafana.explore.richHistory.activeDatasourceOnly',
+  legacyActiveDatasourceOnly: 'grafana.explore.richHistory.activeDatasourceOnly', // @deprecated
   activeDatasourcesOnly: 'grafana.explore.richHistory.activeDatasourcesOnly',
   datasourceFilters: 'grafana.explore.richHistory.datasourceFilters',
 };