diff --git a/core/src/main.zig b/core/src/main.zig
index 62d2c23..e74c609 100644
--- a/core/src/main.zig
+++ b/core/src/main.zig
@@ -105,7 +105,6 @@ export fn _start(magic: u32, info: MultibootInfo) callconv(.C) noreturn {
 
     platform.platformEndInit();
 
-    init.state = .Running;
     thread.enterTask(init);
 }
 
diff --git a/core/src/thread.zig b/core/src/thread.zig
index cd33c97..6939363 100644
--- a/core/src/thread.zig
+++ b/core/src/thread.zig
@@ -42,6 +42,8 @@ pub fn enterTask(task: *ThreadControlBlock) noreturn {
         table = space.phys;
     }
 
+    task.state = .Running;
+
     arch.enterTask(&task.regs, vmm.PHYSICAL_MAPPING_BASE, table.address);
 }