diff --git a/public/app/features/datasources/state/hooks.ts b/public/app/features/datasources/state/hooks.ts
index cc6bc00c054..88673316354 100644
--- a/public/app/features/datasources/state/hooks.ts
+++ b/public/app/features/datasources/state/hooks.ts
@@ -22,6 +22,7 @@ import {
 } from './actions';
 import { DataSourcesRoutesContext } from './contexts';
 import { getDataSourceLoadingNav, buildNavModel, getDataSourceNav } from './navModel';
+import { initialDataSourceSettingsState } from './reducers';
 import { getDataSource, getDataSourceMeta } from './selectors';
 
 export const useInitDataSourceSettings = (uid: string) => {
@@ -33,7 +34,7 @@ export const useInitDataSourceSettings = (uid: string) => {
     return function cleanUp() {
       dispatch(
         cleanUpAction({
-          cleanupAction: (state) => state.dataSourceSettings,
+          cleanupAction: (state) => (state.dataSourceSettings = initialDataSourceSettingsState),
         })
       );
     };