diff --git a/ayanova/src/components/custom-fields-control.vue b/ayanova/src/components/custom-fields-control.vue
index bb24ac83..ebafcd74 100644
--- a/ayanova/src/components/custom-fields-control.vue
+++ b/ayanova/src/components/custom-fields-control.vue
@@ -47,6 +47,17 @@ export default {
       if (!this.$gzlocale) {
         throw "custom-fields-control: $gzlocale is required and missing";
       }
+      // if (!this.formKey) {
+      //   throw "custom-fields-control: formKey property is required and missing";
+      // }
+
+      // if (!this.$store.state.formCustomTemplate[this.formKey]) {
+      //   throw "custom-fields-control: formCustomTemplate not in the Store!";
+      // }
+    }
+  },
+  created() {
+    if (this.$gzdevmode()) {
       if (!this.formKey) {
         throw "custom-fields-control: formKey property is required and missing";
       }