diff --git a/src/commands/cli/feedback.ts b/src/commands/cli/feedback.ts
index 90e7a6d5e..5d86f28c3 100644
--- a/src/commands/cli/feedback.ts
+++ b/src/commands/cli/feedback.ts
@@ -63,7 +63,13 @@ export const feedbackCommand = buildCommand({
       );
     }
 
-    Sentry.captureFeedback({ message });
+    const { getUserInfo } = await import("../../lib/db/user.js");
+    const user = getUserInfo();
+    Sentry.captureFeedback({
+      message,
+      email: user?.email,
+      name: user?.name ?? user?.username,
+    });
 
     // Flush to ensure feedback is sent before process exits
     const sent = await Sentry.flush(3000);
diff --git a/src/lib/init/interactive.ts b/src/lib/init/interactive.ts
index cb4f3556c..af2a26adb 100644
--- a/src/lib/init/interactive.ts
+++ b/src/lib/init/interactive.ts
@@ -123,7 +123,7 @@ async function handleMultiSelect(
       label: featureLabel(feature),
       hint: featureHint(feature),
     })),
-    initialValues: optional,
+    initialValues: optional.filter((f) => f === "performanceMonitoring"),
     required: false,
   });