diff --git a/plugins/builtin/include/content/providers/gdb_provider.hpp b/plugins/builtin/include/content/providers/gdb_provider.hpp
index 5cb5aa9be..65dae1e18 100644
--- a/plugins/builtin/include/content/providers/gdb_provider.hpp
+++ b/plugins/builtin/include/content/providers/gdb_provider.hpp
@@ -52,7 +52,7 @@ class GDBProvider : public hex::prv::Provider {
 
         std::list<CacheLine> m_cache;
 
-        std::jthread m_cacheUpdateThread;
+        std::thread m_cacheUpdateThread;
         std::mutex m_cacheLock;
     };
 
diff --git a/plugins/builtin/source/content/providers.cpp b/plugins/builtin/source/content/providers.cpp
index 184c10da8..0ef2b717b 100644
--- a/plugins/builtin/source/content/providers.cpp
+++ b/plugins/builtin/source/content/providers.cpp
@@ -1,8 +1,8 @@
 #include <hex/api/content_registry.hpp>
 #include <hex/api/event.hpp>
 
-#include "content/providers/file_provider.hpp"
 #include "content/providers/gdb_provider.hpp"
+#include "content/providers/file_provider.hpp"
 
 namespace hex::plugin::builtin {
 
diff --git a/plugins/builtin/source/content/providers/gdb_provider.cpp b/plugins/builtin/source/content/providers/gdb_provider.cpp
index 6546ff9d0..4ced48d5f 100644
--- a/plugins/builtin/source/content/providers/gdb_provider.cpp
+++ b/plugins/builtin/source/content/providers/gdb_provider.cpp
@@ -222,9 +222,9 @@ namespace hex::plugin::builtin::prv {
         this->m_port = port;
 
         if (this->m_socket.isConnected()) {
-            this->m_cacheUpdateThread = std::jthread([this](const std::stop_token& stopToken) {
+            this->m_cacheUpdateThread = std::thread([this]() {
                 auto cacheLine = this->m_cache.begin();
-                while (!stopToken.stop_requested()) {
+                while (this->isConnected()) {
                     {
                         std::scoped_lock lock(this->m_cacheLock);
 
@@ -253,7 +253,6 @@ namespace hex::plugin::builtin::prv {
         this->m_socket.disconnect();
 
         if (this->m_cacheUpdateThread.joinable()) {
-            this->m_cacheUpdateThread.request_stop();
             this->m_cacheUpdateThread.join();
         }
     }