diff --git a/app/javascript/template_builder/area.vue b/app/javascript/template_builder/area.vue
index 626973e9..e8d9090b 100644
--- a/app/javascript/template_builder/area.vue
+++ b/app/javascript/template_builder/area.vue
@@ -614,7 +614,7 @@ export default {
       this.save()
     },
     removeField () {
-      const templateValue = this.template.values[this.field.uuid]
+      const templateValue = this.template?.values?.[this.field.uuid]
       switch (this.field.type) {
         case 'my_signature':
           this.showMySignature = false
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index 41a35d15..c33c46ea 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -594,9 +594,9 @@ export default {
       }
     },
     removeArea (area) {
-      const field = this.template.fields.find((f) => f.areas?.includes(area))
-      if (['my_text', 'my_signature', 'my_initials', 'my_date'].includes(field.type)) {
-        const valuesArray = Object.values(this.template.values)
+      const field = this.template.fields?.find((f) => f.areas?.includes(area))
+      if (['my_text', 'my_signature', 'my_initials', 'my_date'].includes(field.type) && this.template?.values) {
+        const valuesArray = Object.values(this.template?.values)
         const valueIndex = valuesArray.findIndex((value) => value === this.template.values[field.uuid])
         valuesArray.splice(valueIndex, 1)
         const valueKey = Object.keys(this.template.values)[valueIndex]