diff --git a/packages/sanity/src/core/studio/components/navbar/tools/ToolLink.tsx b/packages/sanity/src/core/studio/components/navbar/tools/ToolLink.tsx
index 6e12325c3666..d43edd6bd3df 100644
--- a/packages/sanity/src/core/studio/components/navbar/tools/ToolLink.tsx
+++ b/packages/sanity/src/core/studio/components/navbar/tools/ToolLink.tsx
@@ -18,7 +18,14 @@ export const ToolLink = forwardRef(function ToolLink(
 ) {
   const {name, ...rest} = props
   const state = useRouterState(
-    useCallback((routerState) => ({...routerState, tool: name, [name]: undefined}), [name]),
+    useCallback(
+      () => ({
+        tool: name,
+        // make sure to clear tool state when navigating to another tool
+        [name]: undefined,
+      }),
+      [name],
+    ),
   )
 
   return <StateLink state={state} {...rest} ref={ref} />