diff --git a/core/lib/Foswiki/Macros/SERVERINFORMATION.pm b/core/lib/Foswiki/Macros/SERVERINFORMATION.pm
index 8eaeb66549..cb6628ee70 100644
--- a/core/lib/Foswiki/Macros/SERVERINFORMATION.pm
+++ b/core/lib/Foswiki/Macros/SERVERINFORMATION.pm
@@ -91,6 +91,7 @@ DONE
             $value =~ s/%3D/=/g;
         }
         $value =~ s/\n/\\n/g if defined $value;
+        $value = Foswiki::entityEncode($value);
         $report .=
           "| $key | " . ( ( defined $value ) ? $value : '_undef_' ) . " |\n";
     }