diff --git a/src/fireedge/src/client/components/Tables/Vms/detail.js b/src/fireedge/src/client/components/Tables/Vms/detail.js
index f7d812f27e..4fa27d3c78 100644
--- a/src/fireedge/src/client/components/Tables/Vms/detail.js
+++ b/src/fireedge/src/client/components/Tables/Vms/detail.js
@@ -68,8 +68,8 @@ const VmDetail = ({ id }) => {
             <p>IP: {ips.join(', ') || '--'}</p>
             <p>Start time: {Helper.timeToString(STIME)}</p>
             <p>End time: {Helper.timeToString(ETIME)}</p>
-            <p>Host: {`#${hostId} ${hostname}`}</p>
-            <p>Cluster: {`#${clusterId} ${clusterName}`}</p>
+            <p>Host: {hostId ? `#${hostId} ${hostname}` : ''}</p>
+            <p>Cluster: {clusterId ? `#${clusterId} ${clusterName}` : ''}</p>
             <p>Deploy ID: {DEPLOY_ID}</p>
           </div>
         </div>
diff --git a/src/fireedge/src/client/models/Datastore.js b/src/fireedge/src/client/models/Datastore.js
index 2b5161e877..5c48706626 100644
--- a/src/fireedge/src/client/models/Datastore.js
+++ b/src/fireedge/src/client/models/Datastore.js
@@ -3,7 +3,7 @@ import { DATASTORE_STATES, DATASTORE_TYPES } from 'client/constants'
 
 export const getType = ({ TYPE } = {}) => DATASTORE_TYPES[TYPE]
 
-export const getState = ({ STATE } = {}) => DATASTORE_STATES[STATE]
+export const getState = ({ STATE = 0 } = {}) => DATASTORE_STATES[STATE]
 
 export const getCapacityInfo = ({ TOTAL_MB, USED_MB } = {}) => {
   const percentOfUsed = +USED_MB * 100 / +TOTAL_MB || 0