diff --git a/firmware/export/config.h b/firmware/export/config.h
index 245777a671..ed440f2d2b 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -1461,7 +1461,11 @@ Lyre prototype 1 */
 #error "HAVE_LCD_SLEEP_SETTING requires HAVE_LCD_SLEEP"
 #endif
 
-// XXX Figure out a better place to put this?
+/* Support for unicode codepoints > U+FFFF */
+#if (MEMORYSIZE > 2) && !defined(BOOTLOADER)
+#define UNICODE32
+#endif
+
 #ifdef UNICODE32
 #define ucschar_t unsigned int
 #else