Index: kernel/generic/src/proc/scheduler.c
===================================================================
--- kernel/generic/src/proc/scheduler.c	(revision 515f1b18a4a380af6a2feb75e9d0349bdddfb01c)
+++ kernel/generic/src/proc/scheduler.c	(revision 3fa4e22a35608a0c87e62b58f4585811b6d8533e)
@@ -486,6 +486,4 @@
 	assert(THREAD != NULL);
 
-	fpu_cleanup();
-
 	if (atomic_load(&haltstate))
 		halt();
@@ -508,4 +506,6 @@
 	/* Update thread kernel accounting */
 	atomic_time_increment(&THREAD->kcycles, get_cycle() - THREAD->last_cycle);
+
+	fpu_cleanup();
 
 	/*