diff --git a/frontend/src/views/Admin.jsx b/frontend/src/views/Admin.jsx
index 4de8c320..997aedf8 100644
--- a/frontend/src/views/Admin.jsx
+++ b/frontend/src/views/Admin.jsx
@@ -1031,7 +1031,7 @@ const Admin = (props) => {
 										console.log("Show apps with this category")
 									}}
 								>
-									Find app ({data.apps.length})
+									Find app ({data.apps === null ? 0 : data.apps.length})
 								</Button>
 							</ListItemText>
 						</ListItem>
@@ -1094,7 +1094,7 @@ const Admin = (props) => {
 								style={{minWidth: 150, maxWidth: 150}}
 							/>
 							<ListItemText
-								primary={data.usage.length}
+								primary={data.usage === null ? 0 : data.usage.length}
 								style={{minWidth: 150, maxWidth: 150, overflow: "hidden"}}
 							/>
 							<ListItemText