diff --git a/browser-extension/src/entrypoints/popup/pages/CredentialsList.tsx b/browser-extension/src/entrypoints/popup/pages/CredentialsList.tsx
index d01ac870c..ba5acdb99 100644
--- a/browser-extension/src/entrypoints/popup/pages/CredentialsList.tsx
+++ b/browser-extension/src/entrypoints/popup/pages/CredentialsList.tsx
@@ -107,8 +107,8 @@ const CredentialsList: React.FC = () => {
   const filteredCredentials = credentials.filter(cred => {
     const searchLower = searchTerm.toLowerCase();
     return (
-      cred.ServiceName.toLowerCase().includes(searchLower) ||
-      cred.Username.toLowerCase().includes(searchLower) ||
+      cred.ServiceName?.toLowerCase().includes(searchLower) ||
+      cred.Username?.toLowerCase().includes(searchLower) ||
       (cred.Email?.toLowerCase().includes(searchLower))
     );
   });