diff --git a/src/components/host/HostStatus/HostStatus.tsx b/src/components/host/HostStatus/HostStatus.tsx
index 990ce26e2788ce54ae8189b2b6c0d4a62b59f53d..92f859c75e9b7e9072e2e6468b5f5b3cc39c8a67 100644
--- a/src/components/host/HostStatus/HostStatus.tsx
+++ b/src/components/host/HostStatus/HostStatus.tsx
@@ -6,14 +6,24 @@ import {
   useLazyFindHostAlertsQuery
 } from "../../../store/deployApi";
 
-export const HostStatus = ({ hostId, hideAlerts }) => {
+interface HostStatusProps {
+  hostId?: string;
+  hideAlerts: boolean;
+}
+
+export const HostStatus = ({ hostId, hideAlerts }: HostStatusProps) => {
   const [callFindHostAlerts, { data: hostAlert }] =
     useLazyFindHostAlertsQuery();
 
-  const { data: hostStateStatus } = useFindHostStatusQuery({ hostId });
+  const { data: hostStateStatus } = useFindHostStatusQuery(
+    {
+      hostId: hostId ?? ""
+    },
+    { skip: !hostId }
+  );
 
   useEffect(() => {
-    if (!hideAlerts) {
+    if (!hideAlerts && hostId) {
       callFindHostAlerts({ hostId });
     }
   }, [callFindHostAlerts, hideAlerts, hostId]);
diff --git a/src/components/host/HostStatus/HostStatusData.ts b/src/components/host/HostStatus/HostStatusData.ts
index ce72ed315347af4bdf7b85c24a23adf79144f5d2..9d7104abf5e770af78fbf8db1bfaf1190aa9f2db 100644
--- a/src/components/host/HostStatus/HostStatusData.ts
+++ b/src/components/host/HostStatus/HostStatusData.ts
@@ -1,3 +1,7 @@
+import {
+  HostAlertResponse,
+  HostStatusResponse
+} from "../../../store/deployApi";
 import { SEVERITY, STATUS } from "../../common/Status";
 
 export const HOST_STATUS = {
@@ -5,8 +9,11 @@ export const HOST_STATUS = {
   unreachable: "UNREACHABLE"
 };
 
-export const getHostStatus = (state, alert) => {
-  let { status } = state;
+export const getHostStatus = (
+  state: HostStatusResponse,
+  alert: HostAlertResponse | undefined
+) => {
+  const { status } = state;
   const alertSeverity = alert?.alertSeverity?.toLowerCase();
 
   if (
diff --git a/src/components/host/HostTable.tsx b/src/components/host/HostTable.tsx
index 74c89031a9ab86057b610cf44f668b71fa7b2fe7..b63c2f59a9bdca9bf6af7027f560868eeab88433 100644
--- a/src/components/host/HostTable.tsx
+++ b/src/components/host/HostTable.tsx
@@ -1,5 +1,7 @@
 import { Table, InternalLink, EllipsisText } from "@ess-ics/ce-ui-common";
 import { HostStatus } from "./HostStatus";
+import { HostInfoWithId } from "../../store/deployApi";
+import { OnPageParams, Pagination } from "../../types/common";
 
 const columns = [
   {
@@ -15,10 +17,15 @@ const columns = [
   { field: "scope", headerName: "Network scope" }
 ];
 
-function CreateRow(host) {
+function CreateRow(host: HostInfoWithId) {
   return {
     id: host.hostId,
-    status: <HostStatus hostId={host.hostId} />,
+    status: (
+      <HostStatus
+        hostId={host?.hostId}
+        hideAlerts={false}
+      />
+    ),
     hostName: (
       <InternalLink
         to={`/hosts/${host.hostId}`}
@@ -35,7 +42,19 @@ function CreateRow(host) {
   };
 }
 
-export function HostTable({ hosts, pagination, onPage, loading }) {
+interface HostTableProps {
+  hosts: HostInfoWithId[] | undefined;
+  pagination?: Pagination;
+  onPage?: (page: OnPageParams) => void;
+  loading: boolean;
+}
+
+export function HostTable({
+  hosts,
+  pagination,
+  onPage,
+  loading
+}: HostTableProps) {
   return (
     <Table
       columns={columns}