diff --git a/portal-ui/src/screens/Console/Dashboard/BasicDashboard/DriveInfoCard.tsx b/portal-ui/src/screens/Console/Dashboard/BasicDashboard/DriveInfoCard.tsx
index 865dbdc5b0..2717422146 100644
--- a/portal-ui/src/screens/Console/Dashboard/BasicDashboard/DriveInfoCard.tsx
+++ b/portal-ui/src/screens/Console/Dashboard/BasicDashboard/DriveInfoCard.tsx
@@ -115,19 +115,19 @@ const DriveInfoCard = ({ classes, drive }: ICardProps) => {
               </div>
             </div>
           }
-          title={drive.endpoint}
+          title={drive.endpoint || ""}
           subheader={
             <Grid item xs={12} className={classes.stateContainer}>
               <span className={classes.infoValue}>
                 <strong>Capacity:</strong>{" "}
-                {niceBytes(drive.totalSpace.toString())}
+                {niceBytes(drive.totalSpace ? drive.totalSpace.toString() : "0")}
               </span>
               <span className={classes.infoValue}>
-                <strong>Used:</strong> {niceBytes(drive.usedSpace.toString())}
+                <strong>Used:</strong> {niceBytes(drive.usedSpace ? drive.usedSpace.toString() :  "0")}
               </span>
               <span className={classes.infoValue}>
                 <strong>Available:</strong>{" "}
-                {niceBytes(drive.availableSpace.toString())}
+                {niceBytes(drive.availableSpace ? drive.availableSpace.toString() : "0")}
               </span>
             </Grid>
           }
diff --git a/portal-ui/src/screens/Console/Dashboard/BasicDashboard/ServerInfoCard.tsx b/portal-ui/src/screens/Console/Dashboard/BasicDashboard/ServerInfoCard.tsx
index bb3053adf1..8bb24700ff 100644
--- a/portal-ui/src/screens/Console/Dashboard/BasicDashboard/ServerInfoCard.tsx
+++ b/portal-ui/src/screens/Console/Dashboard/BasicDashboard/ServerInfoCard.tsx
@@ -104,10 +104,10 @@ const ServerInfoCard = ({ classes, server }: ICardProps) => {
     }
   };
 
-  const networkKeys = Object.keys(get(server, "network", []));
+  const networkKeys = Object.keys(get(server, "network", {}));
 
   const networkTotal = networkKeys.length;
-  const totalDrives = server.drives.length;
+  const totalDrives = server.drives ? server.drives.length : 0;
 
   const activeNetwork = networkKeys.reduce((acc: number, currValue: string) => {
     const item = server.network[currValue];
@@ -117,9 +117,9 @@ const ServerInfoCard = ({ classes, server }: ICardProps) => {
     return acc;
   }, 0);
 
-  const activeDisks = server.drives.filter(
+  const activeDisks = server.drives ? server.drives.filter(
     (element) => element.state === "ok"
-  ).length;
+  ).length : 0;
 
   return (
     <Card>
@@ -137,7 +137,7 @@ const ServerInfoCard = ({ classes, server }: ICardProps) => {
             </div>
           </div>
         }
-        title={server.endpoint}
+        title={server.endpoint || ""}
         subheader={
           <Grid item xs={12} className={classes.stateContainer}>
             <span className={classes.infoValue}>
@@ -165,7 +165,7 @@ const ServerInfoCard = ({ classes, server }: ICardProps) => {
               </span>
             </span>
             <span className={classes.infoValue}>
-              <strong>Uptime:</strong> {niceDays(server.uptime)}
+              <strong>Uptime:</strong> {server.uptime ? niceDays(server.uptime) : "N/A"}
             </span>
           </Grid>
         }