diff --git a/src/DocSearch.tsx b/src/DocSearch.tsx
index 9ff7e544..bce446bc 100644
--- a/src/DocSearch.tsx
+++ b/src/DocSearch.tsx
@@ -30,15 +30,10 @@ export interface DocSearchProps
 export function DocSearch(props: DocSearchProps) {
   const [isOpen, setIsOpen] = React.useState(false);
   const searchButtonRef = React.useRef<HTMLButtonElement>(null);
-  const [initialQuery, setInitialQuery] = React.useState('');
 
-  const onOpen = React.useCallback(
-    ({ query = '' } = {}) => {
-      setIsOpen(true);
-      setInitialQuery(query);
-    },
-    [setIsOpen]
-  );
+  const onOpen = React.useCallback(() => {
+    setIsOpen(true);
+  }, [setIsOpen]);
 
   const onClose = React.useCallback(() => {
     setIsOpen(false);
@@ -54,7 +49,6 @@ export function DocSearch(props: DocSearchProps) {
         createPortal(
           <DocSearchModal
             {...props}
-            initialQuery={initialQuery}
             initialScrollY={window.scrollY}
             onClose={onClose}
           />,
diff --git a/src/DocSearchModal.tsx b/src/DocSearchModal.tsx
index afd4ac9c..85dfeae3 100644
--- a/src/DocSearchModal.tsx
+++ b/src/DocSearchModal.tsx
@@ -23,7 +23,6 @@ import { ScreenState } from './ScreenState';
 import { Footer } from './Footer';
 
 interface DocSearchModalProps extends DocSearchProps {
-  initialQuery?: string;
   initialScrollY: number;
   onClose?(): void;
 }
@@ -43,7 +42,6 @@ export function DocSearchModal({
   hitComponent = Hit,
   resultsFooterComponent = () => null,
   navigator,
-  initialQuery: queryFromProp = '',
   initialScrollY = 0,
 }: DocSearchModalProps) {
   const [state, setState] = React.useState<
@@ -59,7 +57,7 @@ export function DocSearchModal({
   const inputRef = React.useRef<HTMLInputElement | null>(null);
   const snipetLength = React.useRef<number>(10);
   const initialQuery = React.useRef(
-    queryFromProp || typeof window !== 'undefined'
+    typeof window !== 'undefined'
       ? window.getSelection()!.toString().slice(0, MAX_QUERY_SIZE)
       : ''
   ).current;
diff --git a/src/useDocSearchKeyboardEvents.ts b/src/useDocSearchKeyboardEvents.ts
index 99f9417d..79040e3e 100644
--- a/src/useDocSearchKeyboardEvents.ts
+++ b/src/useDocSearchKeyboardEvents.ts
@@ -30,7 +30,7 @@ export function useDocSearchKeyboardEvents({
         searchButtonRef.current === document.activeElement
       ) {
         if (/[a-zA-Z0-9]/.test(String.fromCharCode(event.keyCode))) {
-          onOpen({ query: event.keyCode });
+          onOpen();
         }
       }
     }