diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/store/hosts/selectors.ts b/x-pack/plugins/endpoint/public/applications/endpoint/store/hosts/selectors.ts
index 16d8455e4ff07b..b0f949ebbe757a 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/store/hosts/selectors.ts
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/store/hosts/selectors.ts
@@ -80,7 +80,7 @@ export const hasSelectedHost: (state: Immutable<HostState>) => boolean = createS
 );
 
 /** What policy details panel view to show */
-export const showView: (state: HostListState) => 'policy_response' | 'details' = createSelector(
+export const showView: (state: HostState) => 'policy_response' | 'details' = createSelector(
   uiQueryParams,
   searchParams => {
     return searchParams.show === 'policy_response' ? 'policy_response' : 'details';
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/details/host_details.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/details/host_details.tsx
index f59b1fb3e4de3b..fb3aefcd46eec5 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/details/host_details.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/details/host_details.tsx
@@ -33,7 +33,7 @@ const HostIds = styled(EuiListGroupItem)`
 
 export const HostDetails = memo(({ details }: { details: HostMetadata }) => {
   const { appId, appPath, url } = useHostLogsUrl(details.host.id);
-  const queryParams = useHostListSelector(uiQueryParams);
+  const queryParams = useHostSelector(uiQueryParams);
   const history = useHistory();
   const detailsResultsUpper = useMemo(() => {
     return [
diff --git a/x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/details/index.tsx b/x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/details/index.tsx
index 77850cf969252a..bbbddbdbb2023f 100644
--- a/x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/details/index.tsx
+++ b/x-pack/plugins/endpoint/public/applications/endpoint/view/hosts/details/index.tsx
@@ -70,7 +70,7 @@ export const HostDetailsFlyout = memo(() => {
       <EuiFlyoutHeader hasBorder>
         <EuiTitle size="s">
           <h2 data-test-subj="hostDetailsFlyoutTitle">
-            {loading ? <EuiLoadingContent lines={1} /> : details.host.hostname}
+            {loading ? <EuiLoadingContent lines={1} /> : details?.host?.hostname}
           </h2>
         </EuiTitle>
       </EuiFlyoutHeader>