diff --git a/packages/searchkit-elastic-ui/src/SearchBar/__tests__/index.test.tsx b/packages/searchkit-elastic-ui/src/SearchBar/__tests__/index.test.tsx
index f00eaf691..a8d29285d 100644
--- a/packages/searchkit-elastic-ui/src/SearchBar/__tests__/index.test.tsx
+++ b/packages/searchkit-elastic-ui/src/SearchBar/__tests__/index.test.tsx
@@ -45,4 +45,14 @@ describe('SearchBar', () => {
       sortBy: null
     })
   })
+
+  it('api has a query in state', async () => {
+    const mockApi: SearchkitClient = SearchkitClient as any
+    const searchCall = jest.fn()
+    mockApi.setCallbackFn(searchCall)
+    mockApi.setQuery('heat')
+    render(<SearchBar loading={false} />)
+    expect(screen.getByLabelText('Search')).toBeVisible()
+    expect(screen.getByLabelText('Search')).toHaveDisplayValue('heat')
+  })
 })
diff --git a/packages/searchkit-elastic-ui/src/SearchBar/index.tsx b/packages/searchkit-elastic-ui/src/SearchBar/index.tsx
index 5a42e7405..b4a24239c 100644
--- a/packages/searchkit-elastic-ui/src/SearchBar/index.tsx
+++ b/packages/searchkit-elastic-ui/src/SearchBar/index.tsx
@@ -4,7 +4,7 @@ import React, { useState } from 'react'
 
 export const SearchBar = ({ loading }) => {
   const api = useSearchkit()
-  const [value, setValue] = useState('')
+  const [value, setValue] = useState(api.getQuery())
 
   return (
     <EuiFieldSearch