diff --git a/cc3200/mpconfigport.h b/cc3200/mpconfigport.h
index 7a8aa15d583ef370cdd6cef0a91d8265165c7e9b..5b6a035d5c19268273385332405ee1c6c1ab7d69 100644
--- a/cc3200/mpconfigport.h
+++ b/cc3200/mpconfigport.h
@@ -194,6 +194,7 @@ typedef long            mp_off_t;
 
 #define MICROPY_BEGIN_ATOMIC_SECTION()              disable_irq()
 #define MICROPY_END_ATOMIC_SECTION(state)           enable_irq(state)
+#define MICROPY_EVENT_POLL_HOOK                     __WFI();
 
 // assembly functions to handle critical sections, interrupt
 // disabling/enabling and sleep mode enter/exit
diff --git a/extmod/moduselect.c b/extmod/moduselect.c
index a19901e171d5b36884c254ffd3578e651b63a66f..5b00f6badd83dbe1f230bf26481d007cc9281707 100644
--- a/extmod/moduselect.c
+++ b/extmod/moduselect.c
@@ -172,7 +172,7 @@ STATIC mp_obj_t select_select(uint n_args, const mp_obj_t *args) {
             mp_map_deinit(&poll_map);
             return mp_obj_new_tuple(3, list_array);
         }
-        __WFI();
+        MICROPY_EVENT_POLL_HOOK
     }
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_select_select_obj, 3, 4, select_select);
@@ -264,7 +264,7 @@ STATIC mp_obj_t poll_poll(uint n_args, const mp_obj_t *args) {
             }
             return ret_list;
         }
-        __WFI();
+        MICROPY_EVENT_POLL_HOOK
     }
 }
 MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(poll_poll_obj, 1, 3, poll_poll);
diff --git a/stmhal/mpconfigport.h b/stmhal/mpconfigport.h
index ed9e26f37c8a80f7fc33c39f988e78a0199fb2cf..81959555cd8a0d6e86bd9bcc2081ad9adfdbbd70 100644
--- a/stmhal/mpconfigport.h
+++ b/stmhal/mpconfigport.h
@@ -262,6 +262,7 @@ static inline mp_uint_t disable_irq(void) {
 
 #define MICROPY_BEGIN_ATOMIC_SECTION()     disable_irq()
 #define MICROPY_END_ATOMIC_SECTION(state)  enable_irq(state)
+#define MICROPY_EVENT_POLL_HOOK            __WFI();
 
 // There is no classical C heap in bare-metal ports, only Python
 // garbage-collected heap. For completeness, emulate C heap via