diff --git a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_inventory_switcher.tsx b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_inventory_switcher.tsx
index bdd08ab6b366..785531db2ff5 100644
--- a/x-pack/legacy/plugins/infra/public/components/waffle/waffle_inventory_switcher.tsx
+++ b/x-pack/legacy/plugins/infra/public/components/waffle/waffle_inventory_switcher.tsx
@@ -28,6 +28,8 @@ interface WaffleInventorySwitcherProps {
   changeNodeType: (nodeType: InfraNodeType) => void;
   changeGroupBy: (groupBy: InfraSnapshotGroupbyInput[]) => void;
   changeMetric: (metric: InfraSnapshotMetricInput) => void;
+  changeAccount: (id: string) => void;
+  changeRegion: (name: string) => void;
 }
 
 const getDisplayNameForType = (type: InventoryItemType) => {
@@ -39,6 +41,8 @@ export const WaffleInventorySwitcher: React.FC<WaffleInventorySwitcherProps> = (
   changeNodeType,
   changeGroupBy,
   changeMetric,
+  changeAccount,
+  changeRegion,
   nodeType,
 }) => {
   const [isOpen, setIsOpen] = useState(false);
@@ -49,12 +53,14 @@ export const WaffleInventorySwitcher: React.FC<WaffleInventorySwitcherProps> = (
       closePopover();
       changeNodeType(targetNodeType);
       changeGroupBy([]);
+      changeAccount('');
+      changeRegion('');
       const inventoryModel = findInventoryModel(targetNodeType);
       changeMetric({
         type: inventoryModel.metrics.defaultSnapshot as InfraSnapshotMetricType,
       });
     },
-    [closePopover, changeNodeType, changeGroupBy, changeMetric]
+    [closePopover, changeNodeType, changeGroupBy, changeMetric, changeAccount, changeRegion]
   );
   const goToHost = useCallback(() => goToNodeType('host' as InfraNodeType), [goToNodeType]);
   const goToK8 = useCallback(() => goToNodeType('pod' as InfraNodeType), [goToNodeType]);
diff --git a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/toolbar.tsx b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/toolbar.tsx
index a828cd207aa5..a5780f44050e 100644
--- a/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/toolbar.tsx
+++ b/x-pack/legacy/plugins/infra/public/pages/infrastructure/snapshot/toolbar.tsx
@@ -23,12 +23,21 @@ export const SnapshotToolbar = () => (
     <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" gutterSize="m">
       <EuiFlexItem grow={false}>
         <WithWaffleOptions>
-          {({ changeMetric, changeNodeType, changeGroupBy, nodeType }) => (
+          {({
+            changeMetric,
+            changeNodeType,
+            changeGroupBy,
+            changeAccount,
+            changeRegion,
+            nodeType,
+          }) => (
             <WaffleInventorySwitcher
               nodeType={nodeType}
               changeNodeType={changeNodeType}
               changeMetric={changeMetric}
               changeGroupBy={changeGroupBy}
+              changeAccount={changeAccount}
+              changeRegion={changeRegion}
             />
           )}
         </WithWaffleOptions>