diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 2704359a8f95..d8aed6354403 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -5782,10 +5782,13 @@ erts_sched_stat_term(Process *p, int total)
 void
 erts_schedule_misc_op(void (*func)(void *), void *arg)
 {
-    ErtsRunQueue *rq = erts_get_runq_current(NULL);
+    ErtsRunQueue *rq;
     ErtsMiscOpList *molp = misc_op_list_alloc();
+    ErtsSchedulerData *esdp = erts_get_scheduler_data();
 
-    if (!rq) {
+    if (esdp) {
+	rq = esdp->run_queue;
+    } else {
 	/*
 	 * This can only happen when the sys msg dispatcher
 	 * thread schedules misc ops (this happens *very*