diff --git a/include/hermit/tasks.h b/include/hermit/tasks.h
index e31f5298b..478b6cf38 100644
--- a/include/hermit/tasks.h
+++ b/include/hermit/tasks.h
@@ -264,11 +264,10 @@ static inline void check_workqueues_in_irqhandler(int irq)
 
 	check_timers();
 
-	if (irq < 0) {
-		if (go_down)
-			shutdown_system();
+	if (go_down)
+		shutdown_system();
+	if (irq < 0)
 		check_scheduling();
-	}
 }
 
 static inline void check_workqueues(void)