diff --git a/frontend/src/pages/CertificatesPage.tsx b/frontend/src/pages/CertificatesPage.tsx
index 779c931..218a555 100644
--- a/frontend/src/pages/CertificatesPage.tsx
+++ b/frontend/src/pages/CertificatesPage.tsx
@@ -465,7 +465,7 @@ export default function CertificatesPage() {
             <TableBody>
               {Object.values(
                 certs.reduce((acc, cert) => {
-                  const groupKey = cert.host_id || 'unassigned'
+                  const groupKey = `${cert.host_id || 'unassigned'}-${cert.status}`
                   if (!acc[groupKey]) acc[groupKey] = []
                   acc[groupKey].push(cert)
                   return acc