diff --git a/Kernel/TimerQueue.cpp b/Kernel/TimerQueue.cpp
index 8c0da10c14..3edd86f46b 100644
--- a/Kernel/TimerQueue.cpp
+++ b/Kernel/TimerQueue.cpp
@@ -104,7 +104,7 @@ TimerId TimerQueue::add_timer(NonnullRefPtr<Timer>&& timer)
     timer->m_id = ++m_timer_id_count;
     VERIFY(timer->m_id != 0); // wrapped
     add_timer_locked(move(timer));
-    return m_timer_id_count;
+    return timer->m_id;
 }
 
 void TimerQueue::add_timer_locked(NonnullRefPtr<Timer> timer)
diff --git a/Kernel/TimerQueue.h b/Kernel/TimerQueue.h
index 2e897eb0ca..9d8f87701d 100644
--- a/Kernel/TimerQueue.h
+++ b/Kernel/TimerQueue.h
@@ -36,7 +36,7 @@
 
 namespace Kernel {
 
-typedef u64 TimerId;
+TYPEDEF_DISTINCT_ORDERED_ID(u64, TimerId);
 
 class Timer : public RefCounted<Timer>
     , public InlineLinkedListNode<Timer> {