diff --git a/src/commands/new.ts b/src/commands/new.ts
index a471015a5bb..b132d073aa6 100644
--- a/src/commands/new.ts
+++ b/src/commands/new.ts
@@ -81,17 +81,20 @@ export default class New extends Command {
   async createAsyncapiFile(fileName:string) {
     const defaultAsyncapiFile = await readFile(resolve(__dirname, '../../assets/asyncapi.yaml'), { encoding: 'utf8' });
 
+    const fileNameHasFileExtension = fileName.includes('.');
+    const fileNameToWriteToDisk = fileNameHasFileExtension ? fileName : `${fileName}.yaml`;
+
     try {
-      const content = await readFile(fileName, { encoding: 'utf8' });
+      const content = await readFile(fileNameToWriteToDisk, { encoding: 'utf8' });
       if (content !== '') {
-        console.log(`File ${fileName} already exists. Ignoring...`);
+        console.log(`File ${fileNameToWriteToDisk} already exists. Ignoring...`);
         return;
       }
     } catch (e) {
       // File does not exist. Proceed creating it...
     }
     
-    await writeFile(fileName, defaultAsyncapiFile, { encoding: 'utf8' });
-    console.log(`Created file ${fileName}...`);
+    await writeFile(fileNameToWriteToDisk, defaultAsyncapiFile, { encoding: 'utf8' });
+    console.log(`Created file ${fileNameToWriteToDisk}...`);
   }
 }