diff --git a/src/angular/pipes/search-ciphers.pipe.ts b/src/angular/pipes/search-ciphers.pipe.ts
index ba9c454928..e81371c4e8 100644
--- a/src/angular/pipes/search-ciphers.pipe.ts
+++ b/src/angular/pipes/search-ciphers.pipe.ts
@@ -36,7 +36,7 @@ export class SearchCiphersPipe implements PipeTransform {
             if (this.onlySearchName) {
                 return false;
             }
-            if (c.id.substr(0, 8) === searchText) {
+            if (searchText.length >= 8 && c.id.startsWith(searchText)) {
                 return true;
             }
             if (c.subTitle != null && c.subTitle.toLowerCase().indexOf(searchText) > -1) {