diff --git a/api/routers/core.py b/api/routers/core.py
index d7f5138e6..9fc60cea0 100644
--- a/api/routers/core.py
+++ b/api/routers/core.py
@@ -42,7 +42,8 @@ def events_search(projectId: int, q: str,
     if len(q) == 0:
         return {"data": []}
     if live:
-        return assist.autocomplete(project_id=projectId, q=q, key=type.value if type is not None else None)
+        return assist.autocomplete(project_id=projectId, q=q,
+                                   key=key if key is not None else type.value if type is not None else None)
     if type in [schemas.FetchFilterType._url]:
         type = schemas.EventType.request
     elif type in [schemas.GraphqlFilterType._name]: