diff --git a/Userland/Libraries/LibThreading/Thread.cpp b/Userland/Libraries/LibThreading/Thread.cpp
index d8ac15a26c..ce2fa7e3cf 100644
--- a/Userland/Libraries/LibThreading/Thread.cpp
+++ b/Userland/Libraries/LibThreading/Thread.cpp
@@ -23,8 +23,6 @@ Thread::~Thread()
         dbgln("Destroying {} while it is still running undetached!", *this);
         [[maybe_unused]] auto res = join();
     }
-    if (m_state == ThreadState::Detached)
-        dbgln("Bug! {} in state {} is being destroyed; AK/Function will crash shortly!", *this, m_state.load());
 }
 
 ErrorOr<void> Thread::set_priority(int priority)
@@ -80,7 +78,8 @@ void Thread::start()
         // FIXME: Use pthread_attr_t to start a thread detached if that was requested by the user before the call to start().
         nullptr,
         [](void* arg) -> void* {
-            Thread* self = static_cast<Thread*>(arg);
+            auto self = adopt_ref(*static_cast<Thread*>(arg));
+
             auto exit_code = self->m_action();
 
             auto expected = Threading::ThreadState::Running;
@@ -100,7 +99,7 @@ void Thread::start()
 
             return reinterpret_cast<void*>(exit_code);
         },
-        static_cast<void*>(this));
+        &NonnullRefPtr(*this).leak_ref());
 
     VERIFY(rc == 0);
 #ifdef AK_OS_SERENITY
diff --git a/Userland/Libraries/LibThreading/Thread.h b/Userland/Libraries/LibThreading/Thread.h
index aa5f9cf745..b3e7030fe3 100644
--- a/Userland/Libraries/LibThreading/Thread.h
+++ b/Userland/Libraries/LibThreading/Thread.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <AK/Assertions.h>
+#include <AK/AtomicRefCounted.h>
 #include <AK/DeprecatedString.h>
 #include <AK/DistinctNumeric.h>
 #include <AK/Function.h>
@@ -42,7 +43,7 @@ enum class ThreadState : u8 {
 };
 
 class Thread final
-    : public RefCounted<Thread>
+    : public AtomicRefCounted<Thread>
     , public Weakable<Thread> {
 public:
     static NonnullRefPtr<Thread> construct(Function<intptr_t()> action, StringView thread_name = {})