diff --git a/public/app/features/explore/RichHistory/RichHistory.tsx b/public/app/features/explore/RichHistory/RichHistory.tsx
index 0c9e1a13859..3025c115f09 100644
--- a/public/app/features/explore/RichHistory/RichHistory.tsx
+++ b/public/app/features/explore/RichHistory/RichHistory.tsx
@@ -88,7 +88,7 @@ class UnThemedRichHistory extends PureComponent<RichHistoryProps, RichHistorySta
       datasourceFilters: store.getObject(RICH_HISTORY_SETTING_KEYS.datasourceFilters, null),
       retentionPeriod: store.getObject(RICH_HISTORY_SETTING_KEYS.retentionPeriod, 7),
       starredTabAsFirstTab: store.getBool(RICH_HISTORY_SETTING_KEYS.starredTabAsFirstTab, false),
-      activeDatasourceOnly: store.getBool(RICH_HISTORY_SETTING_KEYS.activeDatasourceOnly, false),
+      activeDatasourceOnly: store.getBool(RICH_HISTORY_SETTING_KEYS.activeDatasourceOnly, true),
     };
   }
 
diff --git a/public/app/features/explore/RichHistory/RichHistoryCard.tsx b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
index 04aa14d5522..b04153862ba 100644
--- a/public/app/features/explore/RichHistory/RichHistoryCard.tsx
+++ b/public/app/features/explore/RichHistory/RichHistoryCard.tsx
@@ -8,7 +8,7 @@ import { GrafanaTheme, AppEvents, DataSourceApi } from '@grafana/data';
 import { RichHistoryQuery, ExploreId } from 'app/types/explore';
 import { copyStringToClipboard, createUrlFromRichHistory, createQueryText } from 'app/core/utils/richHistory';
 import appEvents from 'app/core/app_events';
-import { StoreState } from 'app/types';
+import { StoreState, CoreEvents } from 'app/types';
 
 import { changeDatasource, updateRichHistory, setQueries } from '../state/actions';
 export interface Props {
@@ -183,8 +183,22 @@ export function RichHistoryCard(props: Props) {
   };
 
   const onDeleteQuery = () => {
-    updateRichHistory(query.ts, 'delete');
-    appEvents.emit(AppEvents.alertSuccess, ['Query deleted']);
+    // For starred queries, we want confirmation. For non-starred, we don't.
+    if (query.starred) {
+      appEvents.emit(CoreEvents.showConfirmModal, {
+        title: 'Delete',
+        text: 'Are you sure you want to permanently delete your starred query?',
+        yesText: 'Delete',
+        icon: 'trash-alt',
+        onConfirm: () => {
+          updateRichHistory(query.ts, 'delete');
+          appEvents.emit(AppEvents.alertSuccess, ['Query deleted']);
+        },
+      });
+    } else {
+      updateRichHistory(query.ts, 'delete');
+      appEvents.emit(AppEvents.alertSuccess, ['Query deleted']);
+    }
   };
 
   const onStarrQuery = () => {