diff --git a/Lib/email/message.py b/Lib/email/message.py
index b540c33984a753..dfe75e1672653f 100644
--- a/Lib/email/message.py
+++ b/Lib/email/message.py
@@ -339,7 +339,7 @@ def set_payload(self, payload, charset=None):
                 return
             if not isinstance(charset, Charset):
                 charset = Charset(charset)
-            payload = payload.encode(charset.output_charset)
+            payload = payload.encode(charset.output_charset, 'surrogateescape')
         if hasattr(payload, 'decode'):
             self._payload = payload.decode('ascii', 'surrogateescape')
         else: