diff --git a/releases/Next-ChangeLog.md b/releases/Next-ChangeLog.md
index 859dad07..8076f5ea 100644
--- a/releases/Next-ChangeLog.md
+++ b/releases/Next-ChangeLog.md
@@ -14,6 +14,8 @@ This lists the new changes that have not yet been published in a normal release.
 
 - Bugfix: Fix yikes displaying BIP-85 WIF when both NFC and VDisk are OFF
 - Bugfix: Fix inability to export change addresses when both NFC and Vdisk id OFF
+- Bugfix: In BIP-39 words menu, show space character rather than Nokia-style placeholder
+  which could be confused for an underscore.
 
 
 # Q Specific Changes
diff --git a/shared/display.py b/shared/display.py
index 536d6250..bf819683 100644
--- a/shared/display.py
+++ b/shared/display.py
@@ -269,8 +269,10 @@ class Display:
         else:
             self.text(x, y, msg)
 
-        if msg[0] == ' ' and space_indicators:
-            self.icon(x-2, y+11, 'space', invert=is_sel)
+        # LATER: removed because caused confusion w/ underscore
+        #if msg[0] == ' ' and space_indicators:
+            # see also graphics/mono/space.txt
+            #self.icon(x-2, y+9, 'space', invert=is_sel)
 
         if is_checked:
             self.icon(108, y, 'selected', invert=is_sel)
diff --git a/stm32/COLDCARD_MK4/nmi.c b/stm32/COLDCARD_MK4/nmi.c
new file mode 100644
index 00000000..cf45fcd5
--- /dev/null
+++ b/stm32/COLDCARD_MK4/nmi.c
@@ -0,0 +1,13 @@
+//
+// (c) Copyright 2024 by Coinkite Inc. This file is covered by license found in COPYING-CC.
+//
+// nmi.c - handle a NMI errors (at least the flash sources for them) and try to recover.
+// 
+#include "py/mphal.h"
+
+// replace stub from stm32_it.c
+void NMI_Handler(void) {
+    printf("NMI\n");
+}
+
+// EOF