diff --git a/x-pack/plugins/code/public/components/query_bar/components/query_bar.tsx b/x-pack/plugins/code/public/components/query_bar/components/query_bar.tsx
index 830a7c13c9d973..6be42841b0c99f 100644
--- a/x-pack/plugins/code/public/components/query_bar/components/query_bar.tsx
+++ b/x-pack/plugins/code/public/components/query_bar/components/query_bar.tsx
@@ -69,13 +69,13 @@ export class CodeQueryBar extends Component<Props, State> {
       return null;
     }
 
+    const nextState: any = {
+      currentProps: nextProps,
+    };
     if (nextProps.query !== prevState.query) {
-      return {
-        query: nextProps.query,
-        currentProps: nextProps,
-      };
+      nextState.query = nextProps.query;
     }
-    return null;
+    return nextState;
   }
 
   /*