diff --git a/src/services/search.service.ts b/src/services/search.service.ts
index 94518ca739..60b72853ab 100644
--- a/src/services/search.service.ts
+++ b/src/services/search.service.ts
@@ -45,8 +45,8 @@ export class SearchService implements SearchServiceAbstraction {
         (builder as any).field('subTitle', {
             boost: 5,
             extractor: (c: CipherView) => {
-                if (c.type === CipherType.Card && c.subTitle.indexOf('*') === 0) {
-                    return c.subTitle.substr(1);
+                if (c.subTitle != null && c.type === CipherType.Card) {
+                    return c.subTitle.replace(/\*/g, '');
                 }
                 return c.subTitle;
             },