diff --git a/packages/backend/server/utils/markdown.ts b/packages/backend/server/utils/markdown.ts
index 5146fafe..1374f5dc 100644
--- a/packages/backend/server/utils/markdown.ts
+++ b/packages/backend/server/utils/markdown.ts
@@ -114,9 +114,10 @@ _commit: <a href="${checkRunUrl}"><code>${abbreviateCommitHash(workflowData.sha)
 
 function generateTemplatesStr(templates: Record<string, string>) {
   const entries = Object.entries(templates).filter(([k]) => k !== "default");
-  let str = templates.default
-    ? `[Open in Stackblitz](${templates.default})`
-    : "";
+  let str =
+    entries.length === 0 && templates.default
+      ? `[Open in StackBlitz](${templates.default})`
+      : "";
 
   if (entries.length > 0 && entries.length <= 2) {
     str = [str, ...entries.map(([k, v]) => `[${k}](${v})`)]
diff --git a/packages/cli/index.ts b/packages/cli/index.ts
index 04c1793d..e258356e 100644
--- a/packages/cli/index.ts
+++ b/packages/cli/index.ts
@@ -315,7 +315,7 @@ const main = defineCommand({
 
           const noDefaultTemplate = args.template === false;
 
-          if (!noDefaultTemplate) {
+          if (!noDefaultTemplate && templates.length === 0) {
             const project = createDefaultTemplate(
               Object.fromEntries(deps.entries()),
             );