diff --git a/ports/atmel-samd/boards/pygamer/mpconfigboard.mk b/ports/atmel-samd/boards/pygamer/mpconfigboard.mk
index 19fa4f19b9d..0c6f16f8b63 100644
--- a/ports/atmel-samd/boards/pygamer/mpconfigboard.mk
+++ b/ports/atmel-samd/boards/pygamer/mpconfigboard.mk
@@ -12,6 +12,7 @@ LONGINT_IMPL = MPZ
 
 CIRCUITPY_AESIO = 0
 CIRCUITPY_FLOPPYIO = 0
+CIRCUITPY_EPAPERDISPLAY = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
 CIRCUITPY_GIFIO = 0
 CIRCUITPY_I2CDISPLAYBUS = 0
diff --git a/supervisor/shared/background_callback.c b/supervisor/shared/background_callback.c
index 02aa9ae84d5..79b18f7a137 100644
--- a/supervisor/shared/background_callback.c
+++ b/supervisor/shared/background_callback.c
@@ -61,7 +61,10 @@ static int background_prevention_count;
 void PLACE_IN_ITCM(background_callback_run_all)(void) {
     port_background_task();
     if (!background_callback_pending()) {
+        // TEMPORARY to fix #10822
+        #ifdef __ZEPHYR__
         port_yield();
+        #endif
         return;
     }
     CALLBACK_CRITICAL_BEGIN;
@@ -88,7 +91,10 @@ void PLACE_IN_ITCM(background_callback_run_all)(void) {
     }
     --background_prevention_count;
     CALLBACK_CRITICAL_END;
+    // TEMPORARY to fix #10822
+    #ifdef __ZEPHYR__
     port_yield();
+    #endif
 }
 
 void background_callback_prevent(void) {
diff --git a/supervisor/shared/safe_mode.c b/supervisor/shared/safe_mode.c
index 96505565460..bfe27ac7c65 100644
--- a/supervisor/shared/safe_mode.c
+++ b/supervisor/shared/safe_mode.c
@@ -82,7 +82,10 @@ safe_mode_t wait_for_safe_mode_reset(void) {
             boot_in_safe_mode = true;
             break;
         }
+        // TEMPORARY to fix #10822
+        #ifdef __ZEPHYR__
         port_yield();
+        #endif
         diff = supervisor_ticks_ms64() - start_ticks;
     }
     #if CIRCUITPY_STATUS_LED