diff --git a/src/app/vault/ciphers.component.html b/src/app/vault/ciphers.component.html
index 1f3d7c9bfa..3db8a0341c 100644
--- a/src/app/vault/ciphers.component.html
+++ b/src/app/vault/ciphers.component.html
@@ -21,7 +21,7 @@
                 <span class="detail">{{c.subTitle}}</span>
             </a>
         </div>
-        <div *ngIf="searchedCiphers.length === 0" class="no-items">
+        <div *ngIf="loaded && searchedCiphers.length === 0" class="no-items">
             <i class="fa fa-frown-o fa-4x"></i>
             <p>{{'noItemsInList' | i18n}}</p>
             <button (click)="addCipher()" class="btn block primary link">{{'addItem' | i18n}}</button>
diff --git a/src/app/vault/ciphers.component.ts b/src/app/vault/ciphers.component.ts
index 1dc7010e2e..e38ca4748b 100644
--- a/src/app/vault/ciphers.component.ts
+++ b/src/app/vault/ciphers.component.ts
@@ -20,6 +20,7 @@ export class CiphersComponent {
     @Output() onCipherClicked = new EventEmitter<CipherView>();
     @Output() onAddCipher = new EventEmitter();
 
+    loaded: boolean = false;
     ciphers: CipherView[] = [];
     searchText: string;
     searchPlaceholder: string = null;
@@ -36,6 +37,8 @@ export class CiphersComponent {
         } else {
             this.ciphers = ciphers.filter(this.filter);
         }
+
+        this.loaded = true;
     }
 
     async refresh() {