diff --git a/ports/stm32/boards/Passport/modules/flows/sign_electrum_message_flow.py b/ports/stm32/boards/Passport/modules/flows/sign_electrum_message_flow.py
index 541e6cb00..62aeb989c 100644
--- a/ports/stm32/boards/Passport/modules/flows/sign_electrum_message_flow.py
+++ b/ports/stm32/boards/Passport/modules/flows/sign_electrum_message_flow.py
@@ -6,7 +6,7 @@
 from flows import Flow, ScanQRFlow
 from pages import ErrorPage, LongTextPage, LongQuestionPage, ShowQRPage
 from tasks import sign_text_file_task, validate_electrum_message_task
-from utils import spinner_task, stylize_address
+from utils import escape_text, spinner_task, stylize_address
 from data_codecs.qr_type import QRType
 import microns
 from wallets.utils import get_addr_type_from_deriv
@@ -62,7 +62,7 @@ async def show_message(self):
         display_address = stylize_address(self.address)
 
         result = await LongTextPage(centered=True,
-                                    text=('\n' + self.message),
+                                    text=('\n' + escape_text(self.message)),
                                     card_header={'title': 'Message'}).show()
 
         if not result:
diff --git a/ports/stm32/boards/Passport/modules/flows/sign_psbt_common_flow.py b/ports/stm32/boards/Passport/modules/flows/sign_psbt_common_flow.py
index aafcb893f..449ccd80d 100644
--- a/ports/stm32/boards/Passport/modules/flows/sign_psbt_common_flow.py
+++ b/ports/stm32/boards/Passport/modules/flows/sign_psbt_common_flow.py
@@ -275,7 +275,7 @@ def render_warnings(self):
             if self.psbt.warnings and len(self.psbt.warnings) > 0:
                 msg.write('\n\n{}'.format(recolor(HIGHLIGHT_TEXT_HEX, 'Warnings')))
                 for label, m in self.psbt.warnings:
-                    msg.write('\n{}\n{}\n'.format(recolor(BLACK_HEX, label), m))
+                    msg.write('\n{}\n{}\n'.format(recolor(BLACK_HEX, escape_text(label)), escape_text(m)))
                     gc.collect()
 
             return msg.getvalue()
diff --git a/ports/stm32/boards/Passport/modules/tasks/validate_electrum_message_task.py b/ports/stm32/boards/Passport/modules/tasks/validate_electrum_message_task.py
index 230c2a254..5014be876 100644
--- a/ports/stm32/boards/Passport/modules/tasks/validate_electrum_message_task.py
+++ b/ports/stm32/boards/Passport/modules/tasks/validate_electrum_message_task.py
@@ -27,8 +27,7 @@ async def validate_electrum_message_task(on_done, message):
         (subpath, error) = validate_sign_text(message,
                                               header_elements[1],
                                               space_limit=False,
-                                              check_whitespace=False,
-                                              check_ascii=False)
+                                              check_whitespace=False)
 
         if error:
             await on_done(None, error)