diff --git a/packages/services/src/Domain/Vault/VaultService.ts b/packages/services/src/Domain/Vault/VaultService.ts
index bcd30b0d0..f662fb921 100644
--- a/packages/services/src/Domain/Vault/VaultService.ts
+++ b/packages/services/src/Domain/Vault/VaultService.ts
@@ -253,14 +253,14 @@ export class VaultService
   getItemVault(item: DecryptedItemInterface): VaultListingInterface | undefined {
     const latestItem = this.items.findItem(item.uuid)
 
-    if (!latestItem) {
-      throw new Error('Cannot find latest version of item to get vault for')
-    }
-
     if (this.items.isTemplateItem(item)) {
       return undefined
     }
 
+    if (!latestItem) {
+      throw new Error('Cannot find latest version of item to get vault for')
+    }
+
     if (!latestItem.key_system_identifier) {
       return undefined
     }