diff --git a/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/with_log_filter_url_state.tsx b/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/with_log_filter_url_state.tsx
index 90ba39a15db43d..d1da6c715cfc50 100644
--- a/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/with_log_filter_url_state.tsx
+++ b/x-pack/legacy/plugins/infra/public/containers/logs/log_filter/with_log_filter_url_state.tsx
@@ -32,7 +32,7 @@ export const WithLogFilterUrlState: React.FC = () => {
 };
 
 const mapToFilterQuery = (value: any): LogFilterUrlState | undefined =>
-  value && value.kind === 'kuery' && typeof value.expression === 'string'
+  value?.kind === 'kuery' && typeof value.expression === 'string'
     ? {
         kind: value.kind,
         expression: value.expression,
diff --git a/x-pack/test/functional/apps/infra/link_to.ts b/x-pack/test/functional/apps/infra/link_to.ts
index a564da9ab87766..d1ae7138ecc65f 100644
--- a/x-pack/test/functional/apps/infra/link_to.ts
+++ b/x-pack/test/functional/apps/infra/link_to.ts
@@ -33,8 +33,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         const currentUrl = await browser.getCurrentUrl();
         const [, currentHash] = decodeURIComponent(currentUrl).split('#');
         // Account for unpredictable location of the g parameter in the search string
-        expect(currentHash.slice(0, 13)).to.be(expectedRedirectPath);
-        expect(currentHash.slice(13)).to.contain(expectedSearchString);
+        expect(currentHash.slice(0, expectedRedirectPath.length)).to.be(expectedRedirectPath);
+        expect(currentHash.slice(expectedRedirectPath.length)).to.contain(expectedSearchString);
       });
     });
   });