diff --git a/hw/apic.c b/hw/apic.c
index 2c414c1878f69b72e9a273aba63032e605cec06b..9f1d25e55796c52a671fd1be58fe2bff1939d894 100644
--- a/hw/apic.c
+++ b/hw/apic.c
@@ -938,8 +938,6 @@ static void apic_reset(void *opaque)
     APICState *s = opaque;
     int bsp;
 
-    cpu_synchronize_state(s->cpu_env);
-
     bsp = cpu_is_bsp(s->cpu_env);
     s->apicbase = 0xfee00000 |
         (bsp ? MSR_IA32_APICBASE_BSP : 0) | MSR_IA32_APICBASE_ENABLE;
diff --git a/vl.c b/vl.c
index 8e5d9db3e20560e93d20323ad2de820a80fd0879..c6c6a6b59ec1509b520cf62ddfb15cb0f28f6798 100644
--- a/vl.c
+++ b/vl.c
@@ -3683,10 +3683,12 @@ static void *kvm_cpu_thread_fn(void *arg)
     while (!qemu_system_ready)
         qemu_cond_timedwait(&qemu_system_cond, &qemu_global_mutex, 100);
 
+    cpu_synchronize_state(env);
+
     while (1) {
+        qemu_wait_io_event(env);
         if (cpu_can_run(env))
             qemu_cpu_exec(env);
-        qemu_wait_io_event(env);
     }
 
     return NULL;
@@ -3711,6 +3713,9 @@ static void *tcg_cpu_thread_fn(void *arg)
     while (!qemu_system_ready)
         qemu_cond_timedwait(&qemu_system_cond, &qemu_global_mutex, 100);
 
+    for (env = first_cpu; env != NULL; env = env->next_cpu) {
+        cpu_synchronize_state(env);
+    }
     while (1) {
         tcg_cpu_exec();
         qemu_wait_io_event(cur_cpu);