diff --git a/hermit/kernel/syscall.c b/hermit/kernel/syscall.c
index 3cf29171c..ff9f3c718 100644
--- a/hermit/kernel/syscall.c
+++ b/hermit/kernel/syscall.c
@@ -580,7 +580,10 @@ int sys_stat(const char* file, /*struct stat *st*/ void* st)
 
 void sys_yield(void)
 {
-	check_workqueues();
+	//check_workqueues();
+	if (go_down)
+		shutdown_system();
+	check_scheduling();
 }
 
 #if 0