diff --git a/minix/kernel/arch/i386/memory.c b/minix/kernel/arch/i386/memory.c
index 8450aa344f..f70f7d98f0 100644
--- a/minix/kernel/arch/i386/memory.c
+++ b/minix/kernel/arch/i386/memory.c
@@ -964,8 +964,6 @@ int arch_enable_paging(struct proc * caller)
 	}
 #if CONFIG_SMP
 	barrier();
-
-	wait_for_APs_to_finish_booting();
 #endif
 #endif
 
diff --git a/minix/kernel/main.c b/minix/kernel/main.c
index 1f5f3e51f4..50b053810d 100644
--- a/minix/kernel/main.c
+++ b/minix/kernel/main.c
@@ -104,6 +104,9 @@ void bsp_finish_booting(void)
 
   /* Kernel may no longer use bits of memory as VM will be running soon */
   kernel_may_alloc = 0;
+#ifdef CONFIG_SMP
+  wait_for_APs_to_finish_booting();
+#endif
 
   switch_to_user();
   NOT_REACHABLE;