diff --git a/site/multiDim/MultiDimDataPageContent.tsx b/site/multiDim/MultiDimDataPageContent.tsx
index 9166e3be796..f1d16824ad5 100644
--- a/site/multiDim/MultiDimDataPageContent.tsx
+++ b/site/multiDim/MultiDimDataPageContent.tsx
@@ -171,12 +171,10 @@ export const MultiDimDataPageContent = ({
     )
     const titleFragments = useTitleFragments(config)
 
-    const [initialChoices] = useState(() =>
-        initialQueryStr
+    const [currentSettings, setCurrentSettings] = useState(() => {
+        const initialChoices = initialQueryStr
             ? extractDimensionChoicesFromQueryStr(initialQueryStr, config)
             : {}
-    )
-    const [currentSettings, setCurrentSettings] = useState(() => {
         const { selectedChoices } =
             config.filterToAvailableChoices(initialChoices)
         return selectedChoices