diff --git a/src/runtime/proc.c b/src/runtime/proc.c
index 6e947c5f..68d0678 100644
--- a/src/runtime/proc.c
+++ b/src/runtime/proc.c
@@ -59,6 +59,7 @@
 	int32 predawn;	// running initialization, don't run new gs.
 
 	Note	stopped;	// one g can wait here for ms to stop
+	int32 waitstop;	// after setting this flag
 };
 
 Sched sched;
@@ -352,7 +353,10 @@
 		throw("all goroutines are asleep - deadlock!");
 	m->nextg = nil;
 	noteclear(&m->havenextg);
-	notewakeup(&sched.stopped);
+	if(sched.waitstop) {
+		sched.waitstop = 0;
+		notewakeup(&sched.stopped);
+	}
 	unlock(&sched);
 
 	notesleep(&m->havenextg);
@@ -376,6 +380,7 @@
 	sched.mcpumax = 1;
 	while(sched.mcpu > 1) {
 		noteclear(&sched.stopped);
+		sched.waitstop = 1;
 		unlock(&sched);
 		notesleep(&sched.stopped);
 		lock(&sched);