diff --git a/reactos/ntoskrnl/ke/apc.c b/reactos/ntoskrnl/ke/apc.c
index de7e89d7b19..e8baa4e9bba 100644
--- a/reactos/ntoskrnl/ke/apc.c
+++ b/reactos/ntoskrnl/ke/apc.c
@@ -435,10 +435,11 @@ KeRemoveQueueApc (PKAPC Apc)
    PKTHREAD TargetThread;
 
    KeRaiseIrql(HIGH_LEVEL, &oldIrql);
-   KeAcquireSpinLockAtDpcLevel(&PiApcLock);
+   KiAcquireSpinLock(&PiApcLock);
    if (Apc->Inserted == FALSE)
      {
-	KeReleaseSpinLock(&PiApcLock, oldIrql);
+	KiReleaseSpinLock(&PiApcLock);
+  KeLowerIrql(oldIrql);
 	return(FALSE);
      }
 
@@ -454,7 +455,8 @@ KeRemoveQueueApc (PKAPC Apc)
      }
    Apc->Inserted = FALSE;
 
-   KeReleaseSpinLock(&PiApcLock, oldIrql);
+   KiReleaseSpinLock(&PiApcLock);
+   KeLowerIrql(oldIrql);   
    return(TRUE);
 }