diff --git a/public/app/features/datasources/state/navModel.ts b/public/app/features/datasources/state/navModel.ts
index a5058683dd6..d0b76822886 100644
--- a/public/app/features/datasources/state/navModel.ts
+++ b/public/app/features/datasources/state/navModel.ts
@@ -13,6 +13,7 @@ const loadingDSType = 'Loading';
 export function buildNavModel(dataSource: DataSourceSettings, plugin: GenericDataSourcePlugin): NavModelItem {
   const pluginMeta = plugin.meta;
   const highlightsEnabled = config.featureToggles.featureHighlights;
+  const dataSourcePageHeader = config.featureToggles.dataSourcePageHeader;
   const navModel: NavModelItem = {
     img: pluginMeta.info.logos.large,
     id: 'datasource-' + dataSource.uid,
@@ -29,6 +30,10 @@ export function buildNavModel(dataSource: DataSourceSettings, plugin: GenericDat
     ],
   };
 
+  if (!dataSourcePageHeader) {
+    navModel.subTitle = `Type: ${pluginMeta.name}`;
+  }
+
   if (plugin.configPages) {
     for (const page of plugin.configPages) {
       navModel.children!.push({