diff --git a/src/routes/Search/useSearch.js b/src/routes/Search/useSearch.js
index 6f7c9c3eb..64dce1ea8 100644
--- a/src/routes/Search/useSearch.js
+++ b/src/routes/Search/useSearch.js
@@ -16,13 +16,14 @@ const useSearch = (queryParams) => {
         function emitSearchEvent() {
             timerId = null;
             const state = core.transport.getState('search');
-            const query = state.selected.extra.find((extra) => extra[0] === 'search')[1];
-            if (query !== null) {
-                const responses_count = state.catalogs.filter((catalog) => catalog.content.type === 'Ready').length;
+            if (state.selected !== null) {
+                const [, query] = state.selected.extra.find(([name]) => name === 'search');
+                const responses = state.catalogs.filter((catalog) => catalog.content.type === 'Ready');
                 core.transport.analytics({
                     event: 'Search',
                     args: {
-                        query, responses_count
+                        query,
+                        responsesCount: responses.length
                     }
                 });
             }