diff --git a/www/errorreport.php b/www/errorreport.php
index 5200c8dc301bc5506040a42e28a3b374dbb513fa..f2670417faf785545c193f98ae9a712e686bd5da 100644
--- a/www/errorreport.php
+++ b/www/errorreport.php
@@ -51,7 +51,7 @@ $data['directory'] = dirname(dirname(__FILE__));
 if ($config->getOptionalBoolean('errorreporting', true)) {
     $mail = new SimpleSAML\Utils\EMail('SimpleSAMLphp error report from ' . $email);
     $mail->setData($data);
-    if ($email) {
+    if (filter_var($email, FILTER_VALIDATE_EMAIL, FILTER_REQUIRE_SCALAR)) {
         $mail->addReplyTo($email);
     }
     $mail->setText($text);