diff --git a/apps/web/src/features/feedback/components/feedback-toggle.tsx b/apps/web/src/features/feedback/components/feedback-toggle.tsx
index abc94aa41..f4c20bd90 100644
--- a/apps/web/src/features/feedback/components/feedback-toggle.tsx
+++ b/apps/web/src/features/feedback/components/feedback-toggle.tsx
@@ -24,11 +24,16 @@ import { useForm } from "react-hook-form";
 
 import { Trans } from "@/components/trans";
 
+import { isSelfHosted } from "@/utils/constants";
 import { submitFeedback } from "../actions";
 import type { Feedback } from "../schema";
 import { feedbackSchema } from "../schema";
 
 export function FeedbackToggle() {
+  if (isSelfHosted) {
+    return null;
+  }
+
   const form = useForm<Feedback>({
     resolver: zodResolver(feedbackSchema),
   });
diff --git a/packages/emails/src/send-email.tsx b/packages/emails/src/send-email.tsx
index 0927dd9c4..953ef2a3a 100644
--- a/packages/emails/src/send-email.tsx
+++ b/packages/emails/src/send-email.tsx
@@ -140,7 +140,10 @@ export class EmailClient {
     }
 
     try {
-      await this.transport.sendMail(options);
+      await this.transport.sendMail({
+        ...options,
+        from: options.from || this.config.mail.from,
+      });
       return;
     } catch (e) {
       console.error("Error sending email", e);