diff --git a/lib/trinity/scheduler.ex b/lib/trinity/scheduler.ex
index 795647d..7b4262e 100644
--- a/lib/trinity/scheduler.ex
+++ b/lib/trinity/scheduler.ex
@@ -354,7 +354,12 @@ defmodule Trinity.Scheduler do
     # Note that we do not currently bother to destroy aliases here
 
     case :ets.lookup(proc_queue_keys, pid) do
-      [{_event, ^pid, qk}] ->
+      [{:timeout_infinity, _ref}] ->
+        :ets.delete(proc_queue_keys, pid)
+      [{:timeout, _ref, qk}] ->
+        :ets.delete(queue, qk)
+        :ets.delete(proc_queue_keys, pid)
+      [{:resume, qk}] ->
         :ets.delete(queue, qk)
         :ets.delete(proc_queue_keys, pid)
       _ -> :noop