diff --git a/web_ui/frontend/app/director/metrics/components/StorageTable.tsx b/web_ui/frontend/app/director/metrics/components/StorageTable.tsx
index a9c930bca..478642720 100644
--- a/web_ui/frontend/app/director/metrics/components/StorageTable.tsx
+++ b/web_ui/frontend/app/director/metrics/components/StorageTable.tsx
@@ -80,8 +80,8 @@ export const StorageTable = () => {
               <TableBody>
                 {Object.values(storageData)
                   .sort((a, b) => {
-                    const nameA = (a.serverName || '').toUpperCase();
-                    const nameB = (b.serverName || '').toUpperCase();
+                    const nameA = a.serverName.toUpperCase();
+                    const nameB = b.serverName.toUpperCase();
                     return nameA > nameB ? 1 : nameA < nameB ? -1 : 0;
                   })
                   .map((d) => (
@@ -138,6 +138,10 @@ const getStorageData = async (
     const serverName = r.metric.server_name;
     const type = r.metric.type;
 
+    if(serverName === undefined) {
+      return acc;
+    }
+
     acc[serverName] = {
       ...acc?.[serverName],
       serverName: serverName,