diff --git a/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx b/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx
index 7a37ce0d5d..fd28f52a2b 100644
--- a/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx
+++ b/packages/insomnia/src/ui/components/modals/nunjucks-modal.tsx
@@ -7,6 +7,7 @@ import { Modal, type ModalHandle, type ModalProps } from '../base/modal';
 import { ModalBody } from '../base/modal-body';
 import { ModalFooter } from '../base/modal-footer';
 import { ModalHeader } from '../base/modal-header';
+import { ErrorBoundary } from '../error-boundary';
 import { TagEditor } from '../templating/tag-editor';
 import { VariableEditor } from '../templating/variable-editor';
 
@@ -57,6 +58,7 @@ export const NunjucksModal = forwardRef<NunjucksModalHandle, ModalProps & Props>
           editorId,
           onOpenSource,
         });
+        setIsRendering(false);
         modalRef.current?.show();
       },
     }),
@@ -114,7 +116,7 @@ export const NunjucksModal = forwardRef<NunjucksModalHandle, ModalProps & Props>
             modalRef.current?.hide();
           }}
         >
-          {editor}
+          <ErrorBoundary>{editor}</ErrorBoundary>
         </form>
       </ModalBody>
       <ModalFooter>
diff --git a/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx b/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx
index 8e7b1a8838..c2b37ed472 100644
--- a/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx
+++ b/packages/insomnia/src/ui/components/templating/external-vault/external-vault-form.tsx
@@ -30,7 +30,7 @@ export const ExternalVaultForm = (props: ArgConfigFormProps) => {
   const formData = useMemo(() => {
     return JSON.parse(configValue) as ExternalVaultConfig;
   }, [configValue]);
-  const selectedCredentialIdOrCredentialKey = activeTagData.args[1].value?.toString() || '';
+  const selectedCredentialIdOrCredentialKey = activeTagData.args[1]?.value?.toString() || '';
   const isLegacyCredentialTag = models.cloudCredential.isCloudCredentialId(selectedCredentialIdOrCredentialKey);
   const selectedCredentialId = isLegacyCredentialTag
     ? // legacy version to save cloud credential id in tag