diff --git a/apps/server/src/skills/SkillService.ts b/apps/server/src/skills/SkillService.ts
index d673f0229..ebafae25a 100644
--- a/apps/server/src/skills/SkillService.ts
+++ b/apps/server/src/skills/SkillService.ts
@@ -234,7 +234,10 @@ export const SkillServiceLive = Layer.succeed(SkillService, {
           input.name,
           input.description,
           input.scope,
-          { tags: input.tags, template: input.template },
+          {
+            ...(input.tags ? { tags: input.tags } : {}),
+            ...(input.template ? { template: input.template } : {}),
+          },
           input.cwd,
         ),
       catch: (cause) =>
diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index 76d1d3d43..e3c2b3122 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -3027,7 +3027,7 @@ export default function ChatView({ threadId }: ChatViewProps) {
       return;
     }
     const skillManagementCommand =
-      composerImagesForSend.length === 0 && sendableComposerTerminalContexts.length === 0
+      composerAttachmentsForSend.length === 0 && sendableComposerTerminalContexts.length === 0
         ? parseSkillManagementCommand(trimmed)
         : null;
     if (skillManagementCommand) {