diff --git a/web/src/routes/Storage.jsx b/web/src/routes/Storage.jsx
index b32071205..ac21b0bb4 100644
--- a/web/src/routes/Storage.jsx
+++ b/web/src/routes/Storage.jsx
@@ -18,6 +18,10 @@ export default function Storage() {
 
   const { service } = stats || initialStats || emptyObject;
 
+  if (!service || !storage) {
+    return <ActivityIndicator />;
+  }
+
   let storage_usage;
   if (
     service &&
@@ -53,85 +57,79 @@ export default function Storage() {
     <div className="space-y-4 p-2 px-4">
       <Heading>Storage</Heading>
 
-      {!service || !storage ? (
-        <div>
-          <ActivityIndicator />
-        </div>
-      ) : (
-        <Fragment>
-          <Heading size="lg">Overview</Heading>
-          <div data-testid="detectors" className="grid grid-cols-1 md:grid-cols-2 gap-4">
-            <div className="dark:bg-gray-800 shadow-md hover:shadow-lg rounded-lg transition-shadow">
-              <div className="text-lg flex justify-between p-4">Data</div>
-              <div className="p-2">
-                <Table className="w-full">
-                  <Thead>
-                    <Tr>
-                      <Th>Location</Th>
-                      <Th>Used MB</Th>
-                      <Th>Total MB</Th>
-                    </Tr>
-                  </Thead>
-                  <Tbody>{storage_usage}</Tbody>
-                </Table>
-              </div>
+      <Fragment>
+        <Heading size="lg">Overview</Heading>
+        <div data-testid="detectors" className="grid grid-cols-1 md:grid-cols-2 gap-4">
+          <div className="dark:bg-gray-800 shadow-md hover:shadow-lg rounded-lg transition-shadow">
+            <div className="text-lg flex justify-between p-4">Data</div>
+            <div className="p-2">
+              <Table className="w-full">
+                <Thead>
+                  <Tr>
+                    <Th>Location</Th>
+                    <Th>Used MB</Th>
+                    <Th>Total MB</Th>
+                  </Tr>
+                </Thead>
+                <Tbody>{storage_usage}</Tbody>
+              </Table>
             </div>
-            <div className="dark:bg-gray-800 shadow-md hover:shadow-lg rounded-lg transition-shadow">
-              <div className="text-lg flex justify-between p-4">Memory</div>
+          </div>
+          <div className="dark:bg-gray-800 shadow-md hover:shadow-lg rounded-lg transition-shadow">
+            <div className="text-lg flex justify-between p-4">Memory</div>
+            <div className="p-2">
+              <Table className="w-full">
+                <Thead>
+                  <Tr>
+                    <Th>Location</Th>
+                    <Th>Used MB</Th>
+                    <Th>Total MB</Th>
+                  </Tr>
+                </Thead>
+                <Tbody>
+                  <Tr>
+                    <Td>/dev/shm</Td>
+                    <Td>{service['storage']['/dev/shm']['used']}</Td>
+                    <Td>{service['storage']['/dev/shm']['total']}</Td>
+                  </Tr>
+                  <Tr>
+                    <Td>/tmp/cache</Td>
+                    <Td>{service['storage']['/tmp/cache']['used']}</Td>
+                    <Td>{service['storage']['/tmp/cache']['total']}</Td>
+                  </Tr>
+                </Tbody>
+              </Table>
+            </div>
+          </div>
+        </div>
+
+        <Heading size="lg">Cameras</Heading>
+        <div data-testid="detectors" className="grid grid-cols-1 3xl:grid-cols-3 md:grid-cols-2 gap-4">
+          {Object.entries(storage).map(([name, camera]) => (
+            <div key={name} className="dark:bg-gray-800 shadow-md hover:shadow-lg rounded-lg transition-shadow">
+              <div className="capitalize text-lg flex justify-between p-4">
+                <Link href={`/cameras/${name}`}>{name.replaceAll('_', ' ')}</Link>
+              </div>
               <div className="p-2">
                 <Table className="w-full">
                   <Thead>
                     <Tr>
-                      <Th>Location</Th>
-                      <Th>Used MB</Th>
-                      <Th>Total MB</Th>
+                      <Th>Usage</Th>
+                      <Th>Stream Bandwidth</Th>
                     </Tr>
                   </Thead>
                   <Tbody>
                     <Tr>
-                      <Td>/dev/shm</Td>
-                      <Td>{service['storage']['/dev/shm']['used']}</Td>
-                      <Td>{service['storage']['/dev/shm']['total']}</Td>
-                    </Tr>
-                    <Tr>
-                      <Td>/tmp/cache</Td>
-                      <Td>{service['storage']['/tmp/cache']['used']}</Td>
-                      <Td>{service['storage']['/tmp/cache']['total']}</Td>
+                      <Td>{Math.round(camera['usage_percent'] ?? 0)}%</Td>
+                      <Td>{camera['bandwidth'] ? camera['bandwidth'] : 'Calculating...'} MB/hr</Td>
                     </Tr>
                   </Tbody>
                 </Table>
               </div>
             </div>
-          </div>
-
-          <Heading size="lg">Cameras</Heading>
-          <div data-testid="detectors" className="grid grid-cols-1 3xl:grid-cols-3 md:grid-cols-2 gap-4">
-            {Object.entries(storage).map(([name, camera]) => (
-              <div key={name} className="dark:bg-gray-800 shadow-md hover:shadow-lg rounded-lg transition-shadow">
-                <div className="capitalize text-lg flex justify-between p-4">
-                  <Link href={`/cameras/${name}`}>{name.replaceAll('_', ' ')}</Link>
-                </div>
-                <div className="p-2">
-                  <Table className="w-full">
-                    <Thead>
-                      <Tr>
-                        <Th>Usage</Th>
-                        <Th>Stream Bandwidth</Th>
-                      </Tr>
-                    </Thead>
-                    <Tbody>
-                      <Tr>
-                        <Td>{Math.round(camera['usage_percent'] ?? 0)}%</Td>
-                        <Td>{camera['bandwidth'] ? camera['bandwidth'] : 'Calculating...'} MB/hr</Td>
-                      </Tr>
-                    </Tbody>
-                  </Table>
-                </div>
-              </div>
-            ))}
-          </div>
-        </Fragment>
-      )}
+          ))}
+        </div>
+      </Fragment>
     </div>
   );
 }