diff --git a/frontend/package.json b/frontend/package.json
index 72315f1e80ba..6f36ac40610a 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -40,7 +40,7 @@
     "@tanstack/pacer-lite": "0.2.2",
     "@tanstack/query-db-collection": "1.4.8",
     "@tanstack/solid-db": "0.3.12",
-    "@tanstack/solid-form": "1.33.0",
+    "@tanstack/solid-form": "1.33.5",
     "@tanstack/solid-hotkeys": "0.10.0",
     "@tanstack/solid-query": "5.104.5",
     "@tanstack/solid-router": "1.170.38",
diff --git a/frontend/src/ts/components/modals/CustomTestDurationModal.tsx b/frontend/src/ts/components/modals/CustomTestDurationModal.tsx
index 6b643cb7a3ca..da1145bb4f98 100644
--- a/frontend/src/ts/components/modals/CustomTestDurationModal.tsx
+++ b/frontend/src/ts/components/modals/CustomTestDurationModal.tsx
@@ -39,7 +39,7 @@ export function CustomTestDurationModal(): JSXElement {
     },
   }));
 
-  const durationValue = form.useStore((s) => s.values.duration);
+  const durationValue = form.useSelector((s) => s.values.duration);
 
   const humanTime = () => {
     const duration = parseInput(durationValue());
diff --git a/frontend/src/ts/components/modals/CustomTextModal.tsx b/frontend/src/ts/components/modals/CustomTextModal.tsx
index 3aad56d5da84..4a44299e075c 100644
--- a/frontend/src/ts/components/modals/CustomTextModal.tsx
+++ b/frontend/src/ts/components/modals/CustomTextModal.tsx
@@ -173,7 +173,7 @@ export function CustomTextModal(): JSXElement {
     },
   }));
 
-  const formValues = form.useStore((s) => s.values);
+  const formValues = form.useSelector((s) => s.values);
 
   const isDisabled = () => longTextWarning() || challengeWarning();
   const isLimitDisabled = () => formValues().mode === "simple" || isDisabled();
diff --git a/frontend/src/ts/components/modals/ShareTestSettings.tsx b/frontend/src/ts/components/modals/ShareTestSettings.tsx
index b81ec3b14ceb..47626e8cbcac 100644
--- a/frontend/src/ts/components/modals/ShareTestSettings.tsx
+++ b/frontend/src/ts/components/modals/ShareTestSettings.tsx
@@ -28,7 +28,7 @@ export function ShareTestSettings(): JSXElement {
     },
   }));
 
-  const formValues = form.useStore((s) => s.values);
+  const formValues = form.useSelector((s) => s.values);
 
   const url = () => {
     const values = formValues();
diff --git a/frontend/src/ts/components/modals/WordFilterModal.tsx b/frontend/src/ts/components/modals/WordFilterModal.tsx
index 615650611240..86ec74a79fac 100644
--- a/frontend/src/ts/components/modals/WordFilterModal.tsx
+++ b/frontend/src/ts/components/modals/WordFilterModal.tsx
@@ -226,14 +226,14 @@ export function WordFilterModal(props: {
     },
   }));
 
-  const isExactMatch = form.useStore((s) => s.values.exactMatch);
+  const isExactMatch = form.useSelector((s) => s.values.exactMatch);
 
   const [languageWords] = createResource(language, async (lang) => {
     const { data } = await tryCatch(JSONData.getLanguage(lang as Language));
     return data?.words ?? null;
   });
 
-  const formValues = form.useStore((s) => s.values);
+  const formValues = form.useSelector((s) => s.values);
 
   // debounce the preview so it doesn't refilter the whole word list on every keystroke
   const debouncedValues = createDebouncedSignal(formValues, 250);
diff --git a/frontend/src/ts/components/modals/preset/EditPresetModal.tsx b/frontend/src/ts/components/modals/preset/EditPresetModal.tsx
index 7a592f3321af..312cfe5d485b 100644
--- a/frontend/src/ts/components/modals/preset/EditPresetModal.tsx
+++ b/frontend/src/ts/components/modals/preset/EditPresetModal.tsx
@@ -131,7 +131,7 @@ export function EditPresetModal(): JSXElement {
   );
 
   const isUpdateConfig = () => {
-    const formValues = form.useStore((s) => s.values);
+    const formValues = form.useSelector((s) => s.values);
     return formValues().updateConfig;
   };
 
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 61afb70361d5..cb0e565d3009 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -331,8 +331,8 @@ importers:
         specifier: 0.3.12
         version: 0.3.12(solid-js@1.9.13)(typescript@7.0.2)
       '@tanstack/solid-form':
-        specifier: 1.33.0
-        version: 1.33.0(solid-js@1.9.13)
+        specifier: 1.33.5
+        version: 1.33.5(solid-js@1.9.13)
       '@tanstack/solid-hotkeys':
         specifier: 0.10.0
         version: 0.10.0(solid-js@1.9.13)
@@ -4676,8 +4676,8 @@ packages:
       typescript:
         optional: true
 
-  '@tanstack/form-core@1.33.0':
-    resolution: {integrity: sha512-AV4Pw9Dk4orFsuPBcDssfWMJFs+yMYBae7zZ4oTqrCf4ftNGQKxvrQRZeqKHG6A4TkiLeSvf2kzIjcVkrW7E6w==}
+  '@tanstack/form-core@1.33.5':
+    resolution: {integrity: sha512-3dfx9MBP0aq5sXKteikG629X9oviptrQj0IFRk9YGcb+lB7Kv5x8S17oOSk1wUWgjQZ4xVJEMbKwOAODymocgA==}
 
   '@tanstack/history@1.162.4':
     resolution: {integrity: sha512-utTS5L2OkeYUzXGohL1Z8sefu1GLNOJcxe8Hd6iIdc/Xo1K1nDB2JEp4iSFhvYh33xKC9V91TxrS8qfrpoKobQ==}
@@ -4732,8 +4732,8 @@ packages:
     peerDependencies:
       solid-js: '>=1.9.7'
 
-  '@tanstack/solid-form@1.33.0':
-    resolution: {integrity: sha512-+KXp+T/fD+nO5JarDj1W5GctEm4aFuz13DkHVJrdIHGo0evMXlFNWJT57n+TOyvoLoKehknKjM1o41rrKClSTQ==}
+  '@tanstack/solid-form@1.33.5':
+    resolution: {integrity: sha512-azYHYzNwop64bedJRKgjCpi5w9cHu7cNz+dAdSXzaqy9M6JO+GlKNQn54VFhCLYJo45sgNjcdrnz4eyTmgzJ/w==}
     peerDependencies:
       solid-js: '>=1.9.9'
 
@@ -16085,7 +16085,7 @@ snapshots:
     transitivePeerDependencies:
       - supports-color
 
-  '@tanstack/form-core@1.33.0':
+  '@tanstack/form-core@1.33.5':
     dependencies:
       '@tanstack/devtools-event-client': 0.4.3
       '@tanstack/pacer-lite': 0.1.1
@@ -16170,9 +16170,9 @@ snapshots:
       - csstype
       - utf-8-validate
 
-  '@tanstack/solid-form@1.33.0(solid-js@1.9.13)':
+  '@tanstack/solid-form@1.33.5(solid-js@1.9.13)':
     dependencies:
-      '@tanstack/form-core': 1.33.0
+      '@tanstack/form-core': 1.33.5
       '@tanstack/solid-store': 0.11.0(solid-js@1.9.13)
       solid-js: 1.9.13