diff --git a/plugins/Feedback/API.php b/plugins/Feedback/API.php
index 8eefb699585..c3abc8c8532 100644
--- a/plugins/Feedback/API.php
+++ b/plugins/Feedback/API.php
@@ -146,7 +146,8 @@ private function sendMail($subject, $body)
                  . 'URL: ' . Url::getReferrer() . "\n";
 
         $mail = new Mail();
-        $mail->setFrom(Piwik::getCurrentUserEmail());
+        $mail->setDefaultFromPiwik();
+        $mail->addReplyTo(Piwik::getCurrentUserEmail());
         $mail->addTo($feedbackEmailAddress, 'Matomo Team');
         $mail->setSubject($subject);
         $mail->setBodyText($body);