diff --git a/hw/intc/apic.c b/hw/intc/apic.c
index 74e25c6..f54dfa3 100644
--- a/hw/intc/apic.c
+++ b/hw/intc/apic.c
@@ -158,8 +158,12 @@ static void apic_local_deliver(APICCommonState *s, int vector)
 
     trace_apic_local_deliver(vector, (lvt >> 8) & 7);
 
-    if (lvt & APIC_LVT_MASKED)
+    if (lvt & APIC_LVT_MASKED) {
+        if (vector == APIC_LVT_TIMER) {
+            s->timer_pending = true;
+        }
         return;
+    }
 
     switch ((lvt >> 8) & 7) {
     case APIC_DM_SMI:
@@ -1008,6 +1012,10 @@ static int apic_register_write(APICCommonState *s, int index, uint64_t val)
             s->lvt[n] = val;
             if (n == APIC_LVT_TIMER) {
                 apic_timer_update(s, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL));
+                if (!(val & APIC_LVT_MASKED) && s->timer_pending) {
+                    s->timer_pending = false;
+                    apic_local_deliver(s, APIC_LVT_TIMER);
+                }
             } else if (n == APIC_LVT_LINT0 && apic_check_pic(s)) {
                 apic_update_irq(s);
             }
@@ -1017,6 +1025,12 @@ static int apic_register_write(APICCommonState *s, int index, uint64_t val)
         s->initial_count = val;
         s->initial_count_load_time = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL);
         apic_timer_update(s, s->initial_count_load_time);
+        if ((s->lvt[APIC_LVT_TIMER] & APIC_LVT_MASKED) && val &&
+            !(s->lvt[APIC_LVT_TIMER] & APIC_LVT_TIMER_PERIODIC)) {
+            s->next_time = s->initial_count_load_time +
+                (((uint64_t)s->initial_count + 1) << s->count_shift);
+            timer_mod(s->timer, s->next_time);
+        }
         break;
     case 0x39:
         break;
diff --git a/include/hw/i386/apic_internal.h b/include/hw/i386/apic_internal.h
index a26d53b..88b4200 100644
--- a/include/hw/i386/apic_internal.h
+++ b/include/hw/i386/apic_internal.h
@@ -183,6 +183,7 @@ struct APICCommonState {
     int64_t timer_expiry;
     int sipi_vector;
     int wait_for_sipi;
+    bool timer_pending;
 
     uint32_t vapic_control;
     DeviceState *vapic;
