diff --git a/apps/generator/lib/generator.js b/apps/generator/lib/generator.js
index 8b2592a6f..077634e1c 100644
--- a/apps/generator/lib/generator.js
+++ b/apps/generator/lib/generator.js
@@ -875,7 +875,7 @@ class Generator {
     const shouldOverwriteFile = await this.shouldOverwriteFile(relativeTargetFile);
     if (!shouldOverwriteFile) return;
 
-    if (this.templateConfig.conditionalFiles && this.templateConfig.conditionalFiles[relativeSourceFile]) {
+    if (this.templateConfig.conditionalFiles?.[relativeSourceFile]) {
       const server = this.templateParams.server && asyncapiDocument.servers().get(this.templateParams.server);
       const source = jmespath.search({
         ...asyncapiDocument.json(),
diff --git a/apps/generator/lib/utils.js b/apps/generator/lib/utils.js
index 6403eb2fd..e43d09363 100644
--- a/apps/generator/lib/utils.js
+++ b/apps/generator/lib/utils.js
@@ -131,7 +131,7 @@ utils.getGeneratorVersion = () => {
  * @returns {Boolean} is function asynchronous
  */
 utils.isAsyncFunction = (fn) => {
-  return fn && fn.constructor && fn.constructor.name === 'AsyncFunction';
+  return fn?.constructor?.name === 'AsyncFunction';
 };
 
 /**