diff --git a/package.json b/package.json
index cea0295..887b89f 100644
--- a/package.json
+++ b/package.json
@@ -233,5 +233,6 @@
   "prettier": {
     "singleQuote": true,
     "semi": false
-  }
+  },
+  "packageManager": "yarn@1.22.19"
 }
diff --git a/src/__tests__/static-render.tsx b/src/__tests__/static-render.tsx
index 405d131..a2f0fb1 100644
--- a/src/__tests__/static-render.tsx
+++ b/src/__tests__/static-render.tsx
@@ -5,7 +5,11 @@ import { render, cleanup, screen, act } from '@testing-library/react'
 import userEventImport from '@testing-library/user-event'
 import React from 'react'
 import Geschichte from '../lib/adapters/static/index.js'
-import { factoryParameters } from '../lib/store.js'
+import {
+  factoryParameters,
+  InferNamespaceValues,
+  useBatchQuery,
+} from '../lib/store.js'
 import { pm } from '../lib/utils.js'
 import { serializers } from '../lib/serializers.js'
 
@@ -14,11 +18,12 @@ const userEvent = userEventImport.default || userEventImport
 afterEach(cleanup)
 
 describe('<StaticGeschichteProvider />', () => {
+  const defaults = { someParameter: 'test' }
   const { useQuery } = factoryParameters(
     {
       someParameter: pm('parameter', serializers.string),
     },
-    { someParameter: 'test' }
+    defaults
   )
   const ComponentThatRendersSomethingStatically = () => {
     const {
@@ -26,6 +31,10 @@ describe('<StaticGeschichteProvider />', () => {
       replaceState,
       values: { someParameter },
     } = useQuery()
+    type FullStore = {
+      default: InferNamespaceValues<typeof useQuery>
+    }
+    const { batchPushState, batchReplaceState } = useBatchQuery<FullStore>()
     return (
       <>
         <span role="content">{someParameter}</span>
@@ -38,6 +47,28 @@ describe('<StaticGeschichteProvider />', () => {
           }
         ></button>
 
+        <button
+          role="batchPush"
+          onClick={() =>
+            void batchPushState(['default'], (state) => {
+              if (state) {
+                state.someParameter = 'nextBatchPushState'
+              }
+            })
+          }
+        ></button>
+
+        <button
+          role="batchReplace"
+          onClick={() =>
+            void batchReplaceState(['default'], (state) => {
+              if (state) {
+                state.someParameter = 'nextBatchPushState'
+              }
+            })
+          }
+        ></button>
+
         <button
           role="replace"
           onClick={() =>
@@ -74,4 +105,18 @@ describe('<StaticGeschichteProvider />', () => {
     })
     expect(screen.getByRole('content').textContent).toEqual('nextReplaceState')
   })
+
+  it('should support batchPushState', async () => {
+    render(
+      <Geschichte>
+        <ComponentThatRendersSomethingStatically />
+      </Geschichte>
+    )
+    await act(async () => {
+      await userEvent.click(screen.getByRole('batchPush'))
+    })
+    expect(screen.getByRole('content').textContent).toEqual(
+      'nextBatchPushState'
+    )
+  })
 })
diff --git a/src/lib/middleware.ts b/src/lib/middleware.ts
index 9da740f..04e1e28 100644
--- a/src/lib/middleware.ts
+++ b/src/lib/middleware.ts
@@ -63,7 +63,7 @@ export interface StoreState<
   readonly updateFromQuery: (query: string | URLSearchParams) => void
   readonly batchReplaceState: <Keys extends keyof Namespaces>(
     ns: Keys[],
-    fn: (...args: Namespaces[Keys]['values'][]) => void,
+    fn: (...args: (Namespaces[Keys]['values'] | undefined)[]) => void,
     routerOptions?: RouterOptions
   ) => Promise<unknown>
   readonly batchPushState: <Keys extends keyof Namespaces>(