diff --git a/src/system/kernel/arch/arm64/arch_int.cpp b/src/system/kernel/arch/arm64/arch_int.cpp
index 07f4ab9c97..e8a4be7142 100644
--- a/src/system/kernel/arch/arm64/arch_int.cpp
+++ b/src/system/kernel/arch/arm64/arch_int.cpp
@@ -175,10 +175,22 @@ void
 after_exception()
 {
 	Thread* thread = thread_get_current_thread();
+	cpu_status state = disable_interrupts();
 	if (thread->cpu->invoke_scheduler) {
-		disable_interrupts();
 		SpinLocker schedulerLocker(thread->scheduler_lock);
 		scheduler_reschedule(B_THREAD_READY);
+		schedulerLocker.Unlock();
+		restore_interrupts(state);
+	} else if (thread->post_interrupt_callback != NULL) {
+		void (*callback)(void*) = thread->post_interrupt_callback;
+		void* data = thread->post_interrupt_data;
+
+		thread->post_interrupt_callback = NULL;
+		thread->post_interrupt_data = NULL;
+
+		restore_interrupts(state);
+
+		callback(data);
 	}
 }